commit 2d13a3f68d4724af52e47675bedf60709c7b5171 (HEAD, refs/remotes/origin/master) Author: Michael Heerdegen Date: Wed Oct 16 13:07:05 2019 +0200 Extend debug spec of cl-flet (Bug#34481) * lisp/emacs-lisp/cl-macs.el (cl-flet): Extend debug spec to cover definitions of the form (FUNC EXP). diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 92154855f3..80e218884a 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2047,7 +2047,9 @@ recursive function definitions. Use `cl-labels' for that. See info node `(cl) Function Bindings' for details. \(fn ((FUNC ARGLIST BODY...) ...) FORM...)" - (declare (indent 1) (debug ((&rest (cl-defun)) cl-declarations body))) + (declare (indent 1) + (debug ((&rest [&or (&define name function-form) (cl-defun)]) + cl-declarations body))) (let ((binds ()) (newenv macroexpand-all-environment)) (dolist (binding bindings) (let ((var (make-symbol (format "--cl-%s--" (car binding)))) commit 0a70727c4024ac6a66c378df52e37808ee2d7993 Author: Stefan Kangas Date: Thu Oct 17 19:38:06 2019 +0200 Port snake menu to Emacs * lisp/play/snake.el (snake--menu-def): New constant. (snake-mode-menu, snake-null-menu): Add a menu. (snake-mode): Remove XEmacs compat code. (snake-mode-map, snake-null-map): Add docstring. diff --git a/lisp/play/snake.el b/lisp/play/snake.el index d0f9457906..5e8a718f5a 100644 --- a/lisp/play/snake.el +++ b/lisp/play/snake.el @@ -186,12 +186,39 @@ and then start moving it leftwards.") (define-key map "\C-f" 'snake-move-right) (define-key map "\C-p" 'snake-move-up) (define-key map "\C-n" 'snake-move-down) - map)) + map) + "Keymap for Snake games.") (defvar snake-null-map (let ((map (make-sparse-keymap 'snake-null-map))) (define-key map "n" 'snake-start-game) - map)) + map) + "Keymap for finished Snake games.") + +(defconst snake--menu-def + '("Snake" + ["Start new game" snake-start-game + :help "Start a new Snake game"] + ["End game" snake-end-game + :active (snake-active-p) + :help "End the current Snake game"] + ["Pause" snake-pause-game + :active (and (snake-active-p) (not snake-paused)) + :help "Pause running Snake game"] + ["Resume" snake-pause-game + :active (and (snake-active-p) snake-paused) + :help "Resume paused Snake game"]) + "Menu for `snake'. Used to initialize menus.") + +(easy-menu-define + snake-mode-menu snake-mode-map + "Menu for running Snake games." + snake--menu-def) + +(easy-menu-define + snake-null-menu snake-null-map + "Menu for finished Snake games." + snake--menu-def) ;; ;;;;;;;;;;;;;;;; game functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -368,17 +395,6 @@ Argument SNAKE-BUFFER is the name of the buffer." (use-local-map snake-null-map) - (unless (featurep 'emacs) - (setq mode-popup-menu - '("Snake Commands" - ["Start new game" snake-start-game] - ["End game" snake-end-game - (snake-active-p)] - ["Pause" snake-pause-game - (and (snake-active-p) (not snake-paused))] - ["Resume" snake-pause-game - (and (snake-active-p) snake-paused)]))) - (setq gamegrid-use-glyphs snake-use-glyphs-flag) (setq gamegrid-use-color snake-use-color-flag) commit 34923412b5a5888f0f50b3009a6225670be4c026 Author: Martin Rudalics Date: Thu Oct 17 19:35:29 2019 +0200 In 'bury-buffer' don't try to remove current buffer from minibuffer window * lisp/window.el (bury-buffer): Don't try to remove current buffer from minibuffer window. diff --git a/lisp/window.el b/lisp/window.el index 058e89df7c..bf21354703 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4732,13 +4732,16 @@ displayed there." ;; Handle case where `buffer-or-name' is nil and the current buffer ;; is shown in the selected window. (cond - ((or buffer-or-name (not (eq buffer (window-buffer))))) + ((or buffer-or-name + (not (eq buffer (window-buffer))) + ;; Don't try to delete the minibuffer window, undedicate it + ;; or switch to a previous buffer in it. + (window-minibuffer-p))) ((window--delete nil t)) (t ;; Switch to another buffer in window. (set-window-dedicated-p nil nil) (switch-to-prev-buffer nil 'bury))) - ;; Always return nil. nil)) commit 9e44d3373b8ec545c7aa8659446e339c176377c2 Author: Eli Zaretskii Date: Thu Oct 17 20:10:35 2019 +0300 * lisp/recentf.el (recentf-mode): Doc fix. (Bug#37772) diff --git a/lisp/recentf.el b/lisp/recentf.el index 83c71a561a..0828bfc2ba 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -1345,7 +1345,7 @@ That is, remove duplicates, non-kept, and excluded files." When Recentf mode is enabled, a \"Open Recent\" submenu is displayed in the \"File\" menu, containing a list of files that -were operated on recently." +were operated on recently, in the most-recently-used order." :global t :group 'recentf :keymap recentf-mode-map commit 046ac483817ff6a4e4d7ca18d10f4b3942a0ce0f Author: Eli Zaretskii Date: Thu Oct 17 20:07:16 2019 +0300 * lisp/dired.el (dired-auto-revert-buffer): Doc fix. (Bug#37771) diff --git a/lisp/dired.el b/lisp/dired.el index 5ad5904c79..574de7ac3e 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -913,12 +913,16 @@ This feature is used by Auto Revert mode." (dired-directory-changed-p dirname)))) (defcustom dired-auto-revert-buffer nil - "Automatically revert Dired buffer on revisiting. -If t, revisiting an existing Dired buffer automatically reverts it. -If its value is a function, call this function with the directory -name as single argument and revert the buffer if it returns non-nil. -Otherwise, a message offering to revert the changed dired buffer -is displayed. + "Automatically revert Dired buffers on revisiting their directory. +This option controls whether to refresh the directory listing in a +Dired buffer when the directory that is already in some Dired buffer +is revisited by commands such as \\[dired] and \\[dired-find-file]. +If the value is t, revisiting an existing Dired buffer always reverts it. +If the value is a function, it is called with the directory name as a +single argument, and the buffer is reverted if the function returns non-nil. +One such function is `dired-directory-changed-p', which returns non-nil +if the directory has been changed since it was last revisited. +Otherwise, Emacs prompts whether to revert the changed Dired buffer. Note that this is not the same as `auto-revert-mode' that periodically reverts at specified time intervals." :type '(choice commit dc0a218f62cab2eea245b1d577e1edc8e474364e Author: Stefan Kangas Date: Thu Oct 17 18:49:33 2019 +0200 Port tetris menu to Emacs * lisp/play/tetris.el (tetris--menu-def): New constant. (tetris-mode-menu, tetris-null-menu): Add a menu. (tetris-mode): Remove XEmacs compat code. (tetris-null-map, tetris-mode-map): Add docstring. diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el index a797a26d59..b5b77721ec 100644 --- a/lisp/play/tetris.el +++ b/lisp/play/tetris.el @@ -272,13 +272,40 @@ each one of its four blocks.") (define-key map [right] 'tetris-move-right) (define-key map [up] 'tetris-rotate-prev) (define-key map [down] 'tetris-move-down) - map)) + map) + "Keymap for Tetris games.") (defvar tetris-null-map (let ((map (make-sparse-keymap 'tetris-null-map))) (define-key map "n" 'tetris-start-game) (define-key map "q" 'quit-window) - map)) + map) + "Keymap for finished Tetris games.") + +(defconst tetris--menu-def + '("Tetris" + ["Start new game" tetris-start-game + :help "Start a new Tetris game"] + ["End game" tetris-end-game + :active (tetris-active-p) + :help "End the current Tetris game"] + ["Pause" tetris-pause-game + :active (and (tetris-active-p) (not tetris-paused)) + :help "Pause running Tetris game"] + ["Resume" tetris-pause-game + :active (and (tetris-active-p) tetris-paused) + :help "Resume paused Tetris game"]) + "Menu for `tetris'. Used to initialize menus.") + +(easy-menu-define + tetris-mode-menu tetris-mode-map + "Menu for running Tetris games." + tetris--menu-def) + +(easy-menu-define + tetris-null-menu tetris-null-map + "Menu for finished Tetris games." + tetris--menu-def) ;; ;;;;;;;;;;;;;;;; game functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -599,17 +626,6 @@ Drops the shape one square, testing for collision." (use-local-map tetris-null-map) - (unless (featurep 'emacs) - (setq mode-popup-menu - '("Tetris Commands" - ["Start new game" tetris-start-game] - ["End game" tetris-end-game - (tetris-active-p)] - ["Pause" tetris-pause-game - (and (tetris-active-p) (not tetris-paused))] - ["Resume" tetris-pause-game - (and (tetris-active-p) tetris-paused)]))) - (setq show-trailing-whitespace nil) (setq gamegrid-use-glyphs tetris-use-glyphs) commit 96f959521996399b7d75132d9f913577ba59cfb5 Author: Michael Albinus Date: Thu Oct 17 18:46:53 2019 +0200 * lisp/shell.el (shell): Make shell buffer the current buffer. (Bug#37745) diff --git a/lisp/shell.el b/lisp/shell.el index 38b0ef85b9..9593c79de1 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -708,6 +708,8 @@ such as `explicit-csh-args'. If that symbol is a variable, its value is used as a list of arguments when invoking the shell. Otherwise, one argument `-i' is passed to the shell. +Make the shell buffer the current buffer, and return it. + \(Type \\[describe-mode] in the shell buffer for a list of commands.)" (interactive (list @@ -734,40 +736,39 @@ Otherwise, one argument `-i' is passed to the shell. (get-buffer-create (or buffer "*shell*")) ;; If the current buffer is a dead shell buffer, use it. (current-buffer))) - - (with-current-buffer buffer - (with-connection-local-variables - ;; On remote hosts, the local `shell-file-name' might be useless. - (when (file-remote-p default-directory) - (if (and (called-interactively-p 'any) - (null explicit-shell-file-name) - (null (getenv "ESHELL"))) - (set (make-local-variable 'explicit-shell-file-name) - (file-local-name - (expand-file-name - (read-file-name - "Remote shell path: " default-directory shell-file-name - t shell-file-name)))))) - - ;; The buffer's window must be correctly set when we call comint - ;; (so that comint sets the COLUMNS env var properly). - (pop-to-buffer buffer) - ;; Rain or shine, BUFFER must be current by now. - (unless (comint-check-proc buffer) - (let* ((prog (or explicit-shell-file-name - (getenv "ESHELL") shell-file-name)) - (name (file-name-nondirectory prog)) - (startfile (concat "~/.emacs_" name)) - (xargs-name (intern-soft (concat "explicit-" name "-args")))) - (unless (file-exists-p startfile) - (setq startfile (concat user-emacs-directory "init_" name ".sh"))) - (setq-local shell--start-prog (file-name-nondirectory prog)) - (apply #'make-comint-in-buffer "shell" buffer prog - (if (file-exists-p startfile) startfile) - (if (and xargs-name (boundp xargs-name)) - (symbol-value xargs-name) - '("-i"))) - (shell-mode))))) + ;; The buffer's window must be correctly set when we call comint + ;; (so that comint sets the COLUMNS env var properly). + (pop-to-buffer buffer) + + (with-connection-local-variables + ;; On remote hosts, the local `shell-file-name' might be useless. + (when (file-remote-p default-directory) + (if (and (called-interactively-p 'any) + (null explicit-shell-file-name) + (null (getenv "ESHELL"))) + (set (make-local-variable 'explicit-shell-file-name) + (file-local-name + (expand-file-name + (read-file-name + "Remote shell path: " default-directory shell-file-name + t shell-file-name)))))) + + ;; Rain or shine, BUFFER must be current by now. + (unless (comint-check-proc buffer) + (let* ((prog (or explicit-shell-file-name + (getenv "ESHELL") shell-file-name)) + (name (file-name-nondirectory prog)) + (startfile (concat "~/.emacs_" name)) + (xargs-name (intern-soft (concat "explicit-" name "-args")))) + (unless (file-exists-p startfile) + (setq startfile (concat user-emacs-directory "init_" name ".sh"))) + (setq-local shell--start-prog (file-name-nondirectory prog)) + (apply #'make-comint-in-buffer "shell" buffer prog + (if (file-exists-p startfile) startfile) + (if (and xargs-name (boundp xargs-name)) + (symbol-value xargs-name) + '("-i"))) + (shell-mode)))) buffer) ;;; Directory tracking commit d1aafe02c3f00caea42aa107567875fcbfca733d Author: Stefan Kangas Date: Thu Oct 17 15:25:07 2019 +0200 Remove XEmacs compat code from ffap.el * lisp/ffap.el (ffap-what-domain): Remove XEmacs compat code. diff --git a/lisp/ffap.el b/lisp/ffap.el index 5b4e8b5fca..c4e6d8dbf4 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -112,8 +112,6 @@ (defgroup ffap nil "Find file or URL at point." - ;; Dead 2009/07/05. -;; :link '(url-link :tag "URL" "ftp://ftp.mathcs.emory.edu/pub/mic/emacs/") :group 'matching :group 'convenience) @@ -409,8 +407,7 @@ See `mail-extr.el' for the known domains." (defun ffap-what-domain (domain) ;; Like what-domain in mail-extr.el, returns string or nil. (require 'mail-extr) - (let ((ob (or (ffap-symbol-value 'mail-extr-all-top-level-domains) - (ffap-symbol-value 'all-top-level-domains)))) ; XEmacs + (let ((ob (ffap-symbol-value 'mail-extr-all-top-level-domains))) (and ob (get (intern-soft (downcase domain) ob) 'domain-name)))) (defun ffap-machine-p (host &optional service quiet strategy) commit dc05cf12062cb724acd72136d4679439656e3750 Author: Stefan Kangas Date: Thu Oct 17 14:06:24 2019 +0200 Remove XEmacs compat code from imap.el * lisp/net/imap.el (imap-disable-multibyte): Declare obsolete. (imap-log, imap-open): Remove XEmacs compat code. diff --git a/lisp/net/imap.el b/lisp/net/imap.el index eb96309421..71d19185ff 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -454,8 +454,8 @@ sure of changing the value of `foo'." (defmacro imap-disable-multibyte () "Enable multibyte in the current buffer." - (unless (featurep 'xemacs) - '(set-buffer-multibyte nil))) + (declare (obsolete nil "27.1")) + '(set-buffer-multibyte nil)) (defsubst imap-utf7-encode (string) (if imap-use-utf7 @@ -495,7 +495,7 @@ sure of changing the value of `foo'." (defun imap-log (string-or-buffer) (when imap-log (with-current-buffer (get-buffer-create imap-log-buffer) - (imap-disable-multibyte) + (set-buffer-multibyte nil) (buffer-disable-undo) (goto-char (point-max)) (if (bufferp string-or-buffer) @@ -1021,7 +1021,7 @@ necessary. If nil, the buffer name is generated." (if (imap-opened buffer) (imap-close buffer)) (mapc 'make-local-variable imap-local-variables) - (imap-disable-multibyte) + (set-buffer-multibyte nil) (buffer-disable-undo) (setq imap-server (or server imap-server)) (setq imap-port (or port imap-port)) @@ -1044,7 +1044,7 @@ necessary. If nil, the buffer name is generated." (with-current-buffer (get-buffer-create (generate-new-buffer-name " *temp*")) (mapc 'make-local-variable imap-local-variables) - (imap-disable-multibyte) + (set-buffer-multibyte nil) (buffer-disable-undo) (setq imap-server (or server imap-server)) (setq imap-port (or port imap-port)) commit 4531d2bc63768aca34574ad38383c88169b3b0f4 Author: Stefan Kangas Date: Thu Oct 17 13:56:42 2019 +0200 Remove obsolete XEmacs references from manuals * doc/misc/erc.texi: * doc/misc/eshell.texi: * doc/misc/htmlfontify.texi: * doc/misc/remember.texi: * doc/misc/sieve.texi: * doc/misc/viper.texi: Remove obsolete XEmacs references. diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index a6b39c2cbe..4c2da5e122 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -36,7 +36,7 @@ and modified without restriction. @titlepage @title ERC manual @subtitle a full-featured IRC client -@subtitle for Emacs and XEmacs +@subtitle for Emacs @c The following two commands @c start the copyright page. diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 9aba6006b1..dad663bfdc 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -177,9 +177,6 @@ integration with Emacs 21. @item Alex Schroeder contributed code for interactively querying the user before overwriting files. - -@item -Sudish Joseph helped with some XEmacs compatibility issues. @end itemize Apart from these, a lot of people have sent suggestions, ideas, @@ -804,16 +801,6 @@ general. If I change the call to @code{eshell-copy-handles} in to work, but the output occurs after the prompt is displayed. The whole structured command thing is too complicated at present. -@item Error with @command{bc} in @code{eshell-test} - -On some XEmacs system, the subprocess interaction test fails -inexplicably, although @command{bc} works fine at the command prompt. - -@item Eshell does not delete @file{*Help*} buffers in XEmacs 21.1.8+ - -In XEmacs 21.1.8, the @file{*Help*} buffer has been renamed such that -multiple instances of the @file{*Help*} buffer can exist. - @item Pcomplete sometimes gets stuck You press @key{TAB}, but no completions appear, even though the diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index f1da8785eb..fc7ec18cc6 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -1544,9 +1544,7 @@ GNU Emacs 20.7+ or 21.1+ Other versions may work---these have been used successfully by the author. If you intend to use Htmlfontify in batch mode, 21.1+ is -pretty much required. The author does not know if XEmacs, NTemacs, -or J.Random Emacs will run Htmlfontify, but reports/patches/bags of -money are always welcome. +pretty much required. @item A copy of etags (exuberant-ctags or GNU etags). Htmlfontify attempts diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index e692f14cda..99fe0e4abd 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -33,7 +33,7 @@ modify this GNU manual.'' @titlepage @title Guide to Remember Mode @subtitle a simple information manager -@subtitle for Emacs and XEmacs +@subtitle for Emacs @c The following two commands @c start the copyright page. diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi index 2d07b0a8d7..6abdda8c1c 100644 --- a/doc/misc/sieve.texi +++ b/doc/misc/sieve.texi @@ -236,8 +236,8 @@ the @code{fileinto} command. @example require "fileinto"; -if address "sender" "owner-w3-beta@@xemacs.org" @{ - fileinto "INBOX.w3-beta"; +if address "sender" "emacs-devel@@gnu.org" @{ + fileinto "INBOX.emacs-devel"; @} @end example diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 2c3fc02de0..397bed94d3 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -2666,8 +2666,7 @@ menubar. @item viper-multiclick-timeout This variable controls the rate at which double-clicking must occur for the purpose of mouse search and mouse insert. By default, this is set to -@code{double-click-time} in Emacs and to -@code{mouse-track-multi-click-time} milliseconds in XEmacs. +@code{double-click-time}. @end table @kindex S-mouse-1 @kindex S-mouse-2 commit 913a14d3d1f24503e815f884bf55d7a22e228a26 Author: Stefan Kangas Date: Thu Oct 17 13:19:18 2019 +0200 Remove XEmacs reference from viper refcard * etc/refcards/viperCard.tex: Remove reference to XEmacs. diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index 00d9e3b7f5..c3dfce5902 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -1,4 +1,4 @@ -% ViperCard -- The Reference Card for Viper under GNU Emacs and XEmacs +% ViperCard -- The Reference Card for Viper under GNU Emacs % Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc. @@ -58,7 +58,6 @@ \input emacsver.tex \def\versionemacs{21} % version of Emacs this is for -\def\versionxemacs{20} % version of XEmacs this is for \def\versionviper{3.0} % version of Viper this is for % Nothing else needs to be changed. @@ -258,7 +257,7 @@ \title{ViperCard: Viper Reference Pal} -\centerline{(Version \versionviper\ for Emacs \versionemacs\ and XEmacs \versionxemacs)} +\centerline{(Version \versionviper\ for Emacs \versionemacs)} %\copyrightnotice commit 96fe257e73b3f692604de166423dbf2667bc2ec8 Author: Stefan Kangas Date: Thu Oct 17 13:13:05 2019 +0200 Remove XEmacs compat code from tcl.el * lisp/progmodes/tcl.el (tcl-mode): Remove XEmacs compat code. (tcl-popup-menu): Declare obsolete. diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index e5fdd27243..dcdc614c58 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el @@ -604,9 +604,6 @@ already exist." (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_") (set (make-local-variable 'parse-sexp-ignore-comments) t) - ;; XEmacs has defun-prompt-regexp, but I don't believe - ;; that it works for end-of-defun -- only for - ;; beginning-of-defun. (set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp) (set (make-local-variable 'add-log-current-defun-function) 'tcl-add-log-defun) @@ -614,11 +611,7 @@ already exist." (setq-local beginning-of-defun-function #'tcl-beginning-of-defun-function) (setq-local end-of-defun-function #'tcl-end-of-defun-function) - (easy-menu-add tcl-mode-menu) - ;; Append Tcl menu to popup menu for XEmacs. - (if (boundp 'mode-popup-menu) - (setq mode-popup-menu - (cons (concat mode-name " Mode Commands") tcl-mode-menu)))) + (easy-menu-add tcl-mode-menu)) @@ -1541,17 +1534,9 @@ The first line is assumed to look like \"#!.../program ...\"." (if (looking-at "#![^ \t]*/\\([^ \t\n/]+\\)\\([ \t]\\|$\\)") (set (make-local-variable 'tcl-application) (match-string 1))))) - - -;; -;; XEmacs menu support. -;; Taken from schmid@fb3-s7.math.TU-Berlin.DE (Gregor Schmid), -;; who wrote a different Tcl mode. -;; We also have support for menus in Emacs. We do this by -;; loading the XEmacs menu emulation code. -;; - (defun tcl-popup-menu (_e) + "XEmacs menu support." + (declare (obsolete nil "27.1")) (interactive "@e") (popup-menu tcl-mode-menu)) commit bf5a72ac9450c0cc67ac0630bfa7f128988a852f Author: Stefan Kangas Date: Thu Oct 17 13:04:25 2019 +0200 Remove XEmacs reference from erc-button.el todo * lisp/erc/erc-button.el: Remove reference to XEmacs from a todo item. diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 14e5204632..ec70260146 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -31,10 +31,9 @@ ;; (erc-button-mode 1) ;; ;; Todo: -;; * Rewrite all this to do the same, but use button.el from GNU Emacs -;; if it's available for xemacs too. Why? button.el is much faster, -;; and much more elegant, and solves the problem we get with large buffers -;; and a large erc-button-marker-list. +;; * Rewrite all this to do the same, but use button.el. Why? +;; button.el is much faster, and much more elegant, and solves the +;; problem we get with large buffers and a large erc-button-marker-list. ;;; Code: commit 70eeae8f93038cb51a8dfc921b936941a8222dd2 Author: Stefan Kangas Date: Thu Oct 17 13:03:52 2019 +0200 Remove commented out XEmacs compat code from po.el * lisp/textmodes/po.el: Remove commented out XEmacs compat code. diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index 100ce95841..b417543d9e 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -121,12 +121,6 @@ in BUFFER." "Return a (DECODING . ENCODING) pair, according to PO file's charset. Called through `file-coding-system-alist', before the file is visited for real." (po-find-file-coding-system-guts (car arg-list) (car (cdr arg-list)))) -;; This is for XEmacs. -;(defun po-find-file-coding-system (operation filename) -; "\ -;Return a Mule (DECODING . ENCODING) pair, according to PO file charset. -;Called through file-coding-system-alist, before the file is visited for real." -; (po-find-file-coding-system-guts operation filename)) (provide 'po) commit 3cf92da6fa692656d64b70e510efcf4e3682f978 Author: Stefan Kangas Date: Thu Oct 17 12:55:25 2019 +0200 Improve documentation of shell-command-prompt-show-cwd * doc/emacs/misc.texi (Single Shell): * lisp/simple.el (shell-command): Document 'shell-command-prompt-show-cwd'. (Bug#4987) diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 3bfb729dc7..63b65e779c 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -787,6 +787,11 @@ A positive integer tells the shell to use that number of columns for command output. The default value is @code{nil} that means to use the same number of columns as provided by the shell. +@vindex shell-command-prompt-show-cwd + To make the above commands show the current directory in their +prompts, customize the variable @code{shell-command-prompt-show-cwd} +to a non-nil value. + @kindex M-| @findex shell-command-on-region @kbd{M-|} (@code{shell-command-on-region}) is like @kbd{M-!}, but diff --git a/lisp/simple.el b/lisp/simple.el index e44b877931..cd674c36e7 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3508,6 +3508,8 @@ a shell (with its need to quote arguments)." With prefix argument, insert the COMMAND's output at point. Interactively, prompt for COMMAND in the minibuffer. +If `shell-command-prompt-show-cwd' is non-nil, show the current +directory in the prompt. If COMMAND ends in `&', execute it asynchronously. The output appears in the buffer `*Async Shell Command*'.