Merge branch 'master' of https://github.com/emacs-mirror/emacs into pgtk

Author: Yuuki Harano

doc/emacs/msdos.texi

@@ -389,15 +389,16 @@ non-@code{nil} value.
 
 @vindex ls-lisp-verbosity
   The variable @code{ls-lisp-verbosity} controls the file attributes
-that @file{ls-lisp.el} displays.  The value should be a list that
-contains one or more of the symbols @code{links}, @code{uid}, and
-@code{gid}.  @code{links} means display the count of different file
-names that are associated with (a.k.a.@: @dfn{links to}) the file's
-data; this is only useful on NTFS volumes.  @code{uid} means display
-the numerical identifier of the user who owns the file.  @code{gid}
-means display the numerical identifier of the file owner's group.  The
-default value is @code{(links uid gid)} i.e., all the 3 optional
-attributes are displayed.
+that @file{ls-lisp.el} displays.  The value should be either
+@code{nil} or a list that contains one or more of the symbols
+@code{links}, @code{uid}, and @code{gid}.  @code{links} means display
+the count of different file names that are associated with (a.k.a.@:
+@dfn{links to}) the file's data; this is only useful on NTFS volumes.
+@code{uid} means display the numerical identifier of the user who owns
+the file.  @code{gid} means display the numerical identifier of the
+file owner's group.  The default value is @code{(links uid gid)} i.e.,
+all the 3 optional attributes are displayed.  The value @code{nil}
+means not to display any of these attributes.
 
 @vindex ls-lisp-emulation
   The variable @code{ls-lisp-emulation} controls the flavor of the

doc/lispref/lists.texi

@@ -1212,9 +1212,8 @@ functions for sets include @code{memq} and @code{delq}, and their
 @quotation
 @b{Common Lisp note:} Common Lisp has functions @code{union} (which
 avoids duplicate elements) and @code{intersection} for set operations.
-Although standard GNU Emacs Lisp does not have them, the @file{cl-lib}
-library provides versions.
-@xref{Lists as Sets,,, cl, Common Lisp Extensions}.
+In Emacs Lisp, variants of these facilities are provided by the
+@file{cl-lib} library.  @xref{Lists as Sets,,,cl,Common Lisp Extensions}.
 @end quotation
 
 @defun memq object list

doc/lispref/minibuf.texi

@@ -141,6 +141,7 @@ However, if @var{read} is non-@code{nil}, @code{read-from-minibuffer}
 reads the text and returns the resulting Lisp object, unevaluated.
 (@xref{Input Functions}, for information about reading.)
 
+@cindex future history in minibuffer input
 The argument @var{default} specifies default values to make available
 through the history commands.  It should be a string, a list of
 strings, or @code{nil}.  The string or strings become the minibuffer's
@@ -2307,7 +2308,9 @@ This command replaces the minibuffer contents with the value of the
 
 @deffn Command next-history-element n
 This command replaces the minibuffer contents with the value of the
-@var{n}th more recent history element.
+@var{n}th more recent history element.  The position in the history
+can go beyond the current position and invoke ``future history''
+(@pxref{Text from Minibuffer}).
 @end deffn
 
 @deffn Command previous-matching-history-element pattern n
@@ -2338,7 +2341,9 @@ contents of the minibuffer before the point.
 This function puts element of the minibuffer history in the
 minibuffer.  The argument @var{nabs} specifies the absolute history
 position in descending order, where 0 means the current element and a
-positive number @var{n} means the @var{n}th previous element.
+positive number @var{n} means the @var{n}th previous element.  NABS
+being a negative number -@var{n} means the @var{n}th entry of ``future
+history.''
 @end deffn
 
 @node Minibuffer Windows

doc/misc/efaq-w32.texi

@@ -125,10 +125,12 @@ systems.
 @cindex Windows, versions
 @cindex supported versions of Windows
 
-Emacs @value{EMACSVER} is known to run on all versions of Windows from
-Windows 98 and Windows NT 4.0 through to Windows 8.1.  The Windows
-port is built using the Win32 API and supports most features of the X
-version, including variable width fonts, images and tooltips.
+Emacs @value{EMACSVER} is known to run on all versions of Windows 9X
+from Windows 98 onward, and all versions of the NT family starting
+from NT 4.0; this includes all the modern versions from Windows XP and
+on.  The Windows port is built using the Win32 API and supports most
+features of the X version, including variable width fonts, images and
+tooltips.
 
 Emacs on Windows can be compiled as either a 32-bit or a 64-bit
 executable, using the MinGW GCC compiler and development tools.

etc/NEWS

@@ -846,6 +846,9 @@ directories in the destination.
 *** The non-nil value of 'dired-dwim-target' uses one of the most recently
 visited windows with a Dired buffer instead of the next window.
 
+*** When the new user option 'dired-vc-rename-file' is non-nil,
+Dired performs file renaming using underlying version control system.
+
 ** Find-Dired
 
 *** New user option 'find-dired-refine-function'.
@@ -1213,10 +1216,11 @@ A new command 'xref-revert-buffer' is bound to 'g'.
 ** Icomplete
 
 +++
-*** A new minor mode based on Icomplete, Fido mode, is made available.
-The point of this mode, named after "Fake Ido", is to recover much of
-the functionality that still separated the popular ido-mode from
-Icomplete, while still cooperating fully with all of Emacs's
+*** New minor mode Fido mode.
+This mode is based on Icomplete, and its name stands for "Fake Ido".
+The point of this mode is to be an ido-mode workalike, but provide
+most of the functionality present in Icomplete that is not in
+ido-mode, while being much more compatible with all of Emacs's
 completion facilities.
 
 ** Ecomplete
@@ -1441,6 +1445,11 @@ unescaping text.
 The maximum level is used by default; customize
 'font-lock-maximum-decoration' to tone down the decoration.
 
+---
+*** New user option 'python-pdbtrack-kill-buffers'.
+If non-nil, the default, buffers opened during pdbtracking session are
+killed when pdbtracking session is finished.
+
 ** Help
 
 ---

lisp/dired-aux.el

@@ -1635,11 +1635,26 @@ If `ask', ask for user confirmation."
 	       dired-create-files-failures)
 	 (dired-log "Can't set date on %s:\n%s\n" from err))))))
 
+(defcustom dired-vc-rename-file nil
+  "Whether Dired should register file renaming in underlying vc system.
+If nil, use default `rename-file'.
+If non-nil and the renamed files are under version control,
+rename them using `vc-rename-file'."
+  :type '(choice (const :tag "Use rename-file" nil)
+                 (const :tag "Use vc-rename-file" t))
+  :group 'dired
+  :version "27.1")
+
 ;;;###autoload
 (defun dired-rename-file (file newname ok-if-already-exists)
   (dired-handle-overwrite newname)
   (dired-maybe-create-dirs (file-name-directory newname))
-  (rename-file file newname ok-if-already-exists) ; error is caught in -create-files
+  (if (and dired-vc-rename-file
+           (vc-backend file)
+           (ignore-errors (vc-responsible-backend newname)))
+      (vc-rename-file file newname)
+    ;; error is caught in -create-files
+    (rename-file file newname ok-if-already-exists))
   ;; Silently rename the visited file of any buffer visiting this file.
   (and (get-file-buffer file)
        (with-current-buffer (get-file-buffer file)

lisp/emacs-lisp/easymenu.el

@@ -183,17 +183,17 @@ This is expected to be bound to a mouse event."
     (when symbol
       (set symbol keymap)
       (defalias symbol
-	`(lambda (event) ,doc (interactive "@e")
+	(lambda (event) (:documentation doc) (interactive "@e")
 	   ;; FIXME: XEmacs uses popup-menu which calls the binding
 	   ;; while x-popup-menu only returns the selection.
 	   (x-popup-menu event
-			 (or (and (symbolp ,symbol)
+			 (or (and (symbolp symbol)
 				  (funcall
-				   (or (plist-get (get ,symbol 'menu-prop)
+				   (or (plist-get (get symbol 'menu-prop)
 						  :filter)
 				       'identity)
-				   (symbol-function ,symbol)))
-			     ,symbol)))))
+				   (symbol-function symbol)))
+			     symbol)))))
     (dolist (map (if (keymapp maps) (list maps) maps))
       (define-key map
         (vector 'menu-bar (easy-menu-intern (car menu)))
@@ -475,7 +475,7 @@ When non-nil, NOEXP indicates that CALLBACK cannot be an expression
                   ;; `functionp' is probably not needed.
                   (functionp callback) noexp)
               callback
-	    `(lambda () (interactive) ,callback)))
+	    (lambda () (interactive) callback)))
     command))
 
 ;;;###autoload

lisp/emacs-lisp/package.el

@@ -2767,7 +2767,7 @@ Letters do not insert themselves; instead, they are commands.
   (setq tabulated-list-sort-key (cons "Status" nil))
   (add-hook 'tabulated-list-revert-hook #'package-menu--refresh nil t)
   (tabulated-list-init-header)
-  (setq revert-buffer-function 'package-menu--refresh)
+  (setq revert-buffer-function 'package-menu--refresh-contents)
   (setf imenu-prev-index-position-function
         #'package--imenu-prev-index-position-function)
   (setf imenu-extract-index-name-function
@@ -2791,6 +2791,11 @@ package PKG-DESC, add one.  The alist is keyed with PKG-DESC."
 (defvar package--emacs-version-list (version-to-list emacs-version)
   "The value of variable `emacs-version' as a list.")
 
+(defun package--ensure-package-menu-mode ()
+  "Signal a user-error if major mode is not `package-menu-mode'."
+  (unless (derived-mode-p 'package-menu-mode)
+    (user-error "The current buffer is not a Package Menu")))
+
 (defun package--incompatible-p (pkg &optional shallow)
   "Return non-nil if PKG has no chance of being installable.
 PKG is a `package-desc' object.
@@ -2866,8 +2871,7 @@ Installed obsolete packages are always displayed.")
 (defun package-menu-toggle-hiding ()
   "In Package Menu, toggle visibility of obsolete available packages."
   (interactive)
-  (unless (derived-mode-p 'package-menu-mode)
-    (user-error "The current buffer is not a Package Menu"))
+  (package--ensure-package-menu-mode)
   (setq package-menu--hide-packages
         (not package-menu--hide-packages))
   (if package-menu--hide-packages
@@ -3166,7 +3170,7 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
 (defvar package-menu--old-archive-contents nil
   "`package-archive-contents' before the latest refresh.")
 
-(defun package-menu--refresh (&optional _arg _noconfirm)
+(defun package-menu--refresh-contents (&optional _arg _noconfirm)
   "In Package Menu, download the Emacs Lisp package archive.
 Fetch the contents of each archive specified in
 `package-archives', and then refresh the package menu.  Signal a
@@ -3175,8 +3179,7 @@ user-error if there is already a refresh running asynchronously.
 `package-menu-mode' sets `revert-buffer-function' to this
 function.  The args ARG and NOCONFIRM, passed from
 `revert-buffer', are ignored."
-  (unless (derived-mode-p 'package-menu-mode)
-    (user-error "The current buffer is not a Package Menu"))
+  (package--ensure-package-menu-mode)
   (when (and package-menu-async package--downloads-in-progress)
     (user-error "Package refresh is already in progress, please wait..."))
   (setq package-menu--old-archive-contents package-archive-contents)
@@ -3188,6 +3191,7 @@ function.  The args ARG and NOCONFIRM, passed from
   "Hide a package under point in Package Menu.
 If optional arg BUTTON is non-nil, describe its associated package."
   (interactive)
+  (package--ensure-package-menu-mode)
   (declare (interactive-only "change `package-hidden-regexps' instead."))
   (let* ((name (when (derived-mode-p 'package-menu-mode)
                  (concat "\\`" (regexp-quote (symbol-name (package-desc-name
@@ -3221,6 +3225,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
 (defun package-menu-mark-delete (&optional _num)
   "Mark a package for deletion and move to the next line."
   (interactive "p")
+  (package--ensure-package-menu-mode)
   (if (member (package-menu-get-status)
               '("installed" "dependency" "obsolete" "unsigned"))
       (tabulated-list-put-tag "D" t)
@@ -3229,24 +3234,28 @@ If optional arg BUTTON is non-nil, describe its associated package."
 (defun package-menu-mark-install (&optional _num)
   "Mark a package for installation and move to the next line."
   (interactive "p")
+  (package--ensure-package-menu-mode)
   (if (member (package-menu-get-status) '("available" "avail-obso" "new" "dependency"))
       (tabulated-list-put-tag "I" t)
     (forward-line)))
 
 (defun package-menu-mark-unmark (&optional _num)
   "Clear any marks on a package and move to the next line."
   (interactive "p")
+  (package--ensure-package-menu-mode)
   (tabulated-list-put-tag " " t))
 
 (defun package-menu-backup-unmark ()
   "Back up one line and clear any marks on that package."
   (interactive)
+  (package--ensure-package-menu-mode)
   (forward-line -1)
   (tabulated-list-put-tag " "))
 
 (defun package-menu-mark-obsolete-for-deletion ()
   "Mark all obsolete packages for deletion."
   (interactive)
+  (package--ensure-package-menu-mode)
   (save-excursion
     (goto-char (point-min))
     (while (not (eobp))
@@ -3277,6 +3286,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
   "Show short key binding help for `package-menu-mode'.
 The full list of keys can be viewed with \\[describe-mode]."
   (interactive)
+  (package--ensure-package-menu-mode)
   (message (mapconcat #'package--prettify-quick-help-key
                       package--quick-help-keys "\n")))
 
@@ -3285,6 +3295,7 @@ The full list of keys can be viewed with \\[describe-mode]."
 
 (defun package-menu-get-status ()
   "Return status text of package at point in Package Menu."
+  (package--ensure-package-menu-mode)
   (let* ((id (tabulated-list-get-id))
          (entry (and id (assoc id tabulated-list-entries))))
     (if entry
@@ -3340,8 +3351,6 @@ corresponding to the newer version."
 (defun package-menu--mark-upgrades-1 ()
   "Mark all upgradable packages in the Package Menu.
 Implementation of `package-menu-mark-upgrades'."
-  (unless (derived-mode-p 'package-menu-mode)
-    (error "The current buffer is not a Package Menu"))
   (setq package-menu--mark-upgrades-pending nil)
   (let ((upgrades (package-menu--find-upgrades)))
     (if (null upgrades)
@@ -3373,6 +3382,7 @@ If there's an async refresh operation in progress, the flags will
 be placed as part of `package-menu--post-refresh' instead of
 immediately."
   (interactive)
+  (package--ensure-package-menu-mode)
   (if (not package--downloads-in-progress)
       (package-menu--mark-upgrades-1)
     (setq package-menu--mark-upgrades-pending t)
@@ -3466,8 +3476,7 @@ Packages marked for installation are downloaded and installed;
 packages marked for deletion are removed.
 Optional argument NOQUERY non-nil means do not ask the user to confirm."
   (interactive)
-  (unless (derived-mode-p 'package-menu-mode)
-    (error "The current buffer is not in Package Menu mode"))
+  (package--ensure-package-menu-mode)
   (let (install-list delete-list cmd pkg-desc)
     (save-excursion
       (goto-char (point-min))
@@ -3646,7 +3655,7 @@ short description."
       (package-menu-mode)
 
       ;; Fetch the remote list of packages.
-      (unless no-fetch (package-menu--refresh))
+      (unless no-fetch (package-menu--refresh-contents))
 
       ;; If we're not async, this would be redundant.
       (when package-menu-async
@@ -3693,6 +3702,7 @@ Statuses available include \"incompat\", \"available\",
   (interactive
    (list (completing-read-multiple
           "Keywords (comma separated): " (package-all-keywords))))
+  (package--ensure-package-menu-mode)
   (package-show-package-list t (if (stringp keyword)
                                    (list keyword)
                                  keyword)))
@@ -3702,6 +3712,7 @@ Statuses available include \"incompat\", \"available\",
 Show only those items whose name matches the regular expression
 NAME.  If NAME is nil or the empty string, show all packages."
   (interactive (list (read-from-minibuffer "Filter by name (regexp): ")))
+  (package--ensure-package-menu-mode)
   (if (or (not name) (string-empty-p name))
       (package-show-package-list t nil)
     ;; Update `tabulated-list-entries' so that it contains all
@@ -3719,6 +3730,7 @@ NAME.  If NAME is nil or the empty string, show all packages."
 (defun package-menu-clear-filter ()
   "Clear any filter currently applied to the \"*Packages*\" buffer."
   (interactive)
+  (package--ensure-package-menu-mode)
   (package-menu--generate t t))
 
 (defun package-list-packages-no-fetch ()