Merge from origin/emacs-25

78f9af7 ; ChangeLog fixes
162e549 * admin/authors.el (authors-ignored-files): Additions.
2b31a0c In x_set_window_size restore do_pending_window_change calls
401857e Fix Alt-modified keys on some European MS-Windows keyboards
a77cf24 Document 'help-go-forward'
1ba947f Revert "Allow to customize names of executables used by grep.el"
570e0fa Revert "Don't use 'find-program'"
645f4ef Revert "Use 'grep-find-program' in check-declare.el"
aa03257 Clarify documentation of 'dired-mark-files-containing-regexp'
ce0d8c7 Make tmm-menubar work in correct order again
b8d5a8f Remove the Meta-CVS VC backend

8 files changed, 40 insertions, 43 deletions

diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index ee03661ece0..29081d3f3cd 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -6835,7 +6835,7 @@
         console as well (bug#18629).
         * w32-common-fns.el: Remove.
         * loadup.el: Don't load w32-common-fns.el.
-        * w32-fns.elc: Don't require w32-common-fns.
+        * w32-fns.el: Don't require w32-common-fns.
 
         * icomplete.el: Move Iswitchb autoload here.  Much simpler.
         * obsolete/iswitchb.el (iswitchb-mode): Use normal autoload cookie.
diff --git a/lisp/dired.el b/lisp/dired.el
index 2a65bd09cc5..38979b5244d 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3357,7 +3357,12 @@ object files--just `.o' will mark more than you might think."
 (defun dired-mark-files-containing-regexp (regexp &optional marker-char)
   "Mark all files with contents containing REGEXP for use in later commands.
 A prefix argument means to unmark them instead.
-`.' and `..' are never marked."
+`.' and `..' are never marked.
+
+Note that if a file is visited in an Emacs buffer, this command will
+look in the buffer without revisiting the file, so the results might
+be inconsistent with the file on disk if its contents has changed
+since it was last visited."
   (interactive
    (list (read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
                               " files containing (regexp): ")
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index b8a00b3fb4e..b6fa0546088 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -339,7 +339,7 @@ Returns non-nil if any false statements are found."
         errlist files)
     (message "%s" m)
     (message "%s" m2)
-    (setq files (process-lines grep-find-program root
+    (setq files (process-lines find-program root
                                "-name" "*.el"
                                "-exec" grep-program
                                "-l" "^[ \t]*(declare-function" "{}" ";"))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index a478c95eb4f..2b44b58f245 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -427,34 +427,21 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 This gets tacked on the end of the generated expressions.")
 
 ;;;###autoload
-(defcustom grep-program (purecopy "grep")
+(defvar grep-program (purecopy "grep")
   "The default grep program for `grep-command' and `grep-find-command'.
-This variable's value takes effect when `grep-compute-defaults' is called."
-  :type 'string
-  :version "25.1"
-  :group 'grep)
+This variable's value takes effect when `grep-compute-defaults' is called.")
 
 ;;;###autoload
-(defcustom grep-find-program (purecopy "find")
+(defvar find-program (purecopy "find")
   "The default find program.
 This is used by commands like `grep-find-command', `find-dired'
-and others."
-  :type 'string
-  :version "25.1"
-  :group 'grep)
-
-(define-obsolete-variable-alias 'find-program 'grep-find-program "25.1")
+and others.")
 
 ;;;###autoload
-(defcustom grep-xargs-program (purecopy "xargs")
+(defvar xargs-program (purecopy "xargs")
   "The default xargs program for `grep-find-command'.
 See `grep-find-use-xargs'.
-This variable's value takes effect when `grep-compute-defaults' is called."
-  :type 'string
-  :version "25.1"
-  :group 'grep)
-
-(define-obsolete-variable-alias 'xargs-program 'grep-xargs-program "25.1")
+This variable's value takes effect when `grep-compute-defaults' is called.")
 
 ;;;###autoload
 (defvar grep-find-use-xargs nil
@@ -624,14 +611,13 @@ This function is called from `compilation-filter-hook'."
         (unless grep-find-use-xargs
           (setq grep-find-use-xargs
                 (cond
-                 ((grep-probe grep-find-program
+                 ((grep-probe find-program
                               `(nil nil nil ,null-device "-exec" "echo"
                                     "{}" "+"))
                   'exec-plus)
                  ((and
-                   (grep-probe grep-find-program
-                               `(nil nil nil ,null-device "-print0"))
-                   (grep-probe grep-xargs-program `(nil nil nil "-0" "echo")))
+                   (grep-probe find-program `(nil nil nil ,null-device "-print0"))
+                   (grep-probe xargs-program `(nil nil nil "-0" "echo")))
                   'gnu)
                  (t
                   'exec))))
@@ -642,11 +628,10 @@ This function is called from `compilation-filter-hook'."
                        ;; after the pipe symbol be quoted if they use
                        ;; forward slashes as directory separators.
                        (format "%s . -type f -print0 | \"%s\" -0 %s"
-                               grep-find-program grep-xargs-program
-                               grep-command))
+                               find-program xargs-program grep-command))
                       ((memq grep-find-use-xargs '(exec exec-plus))
                        (let ((cmd0 (format "%s . -type f -exec %s"
-                                           grep-find-program grep-command))
+                                           find-program grep-command))
                              (null (if grep-use-null-device
                                        (format "%s " null-device)
                                      "")))
@@ -658,8 +643,7 @@ This function is called from `compilation-filter-hook'."
                           (1+ (length cmd0)))))
                       (t
                        (format "%s . -type f -print | \"%s\" %s"
-                               grep-find-program grep-xargs-program
-                               grep-command)))))
+                               find-program xargs-program grep-command)))))
         (unless grep-find-template
           (setq grep-find-template
                 (let ((gcmd (format "%s <C> %s <R>"
@@ -669,17 +653,17 @@ This function is called from `compilation-filter-hook'."
                               "")))
                   (cond ((eq grep-find-use-xargs 'gnu)
                          (format "%s <D> <X> -type f <F> -print0 | \"%s\" -0 %s"
-                                 grep-find-program grep-xargs-program gcmd))
+                                 find-program xargs-program gcmd))
                         ((eq grep-find-use-xargs 'exec)
                          (format "%s <D> <X> -type f <F> -exec %s {} %s%s"
-                                 grep-find-program gcmd null
+                                 find-program gcmd null
                                  (shell-quote-argument ";")))
                         ((eq grep-find-use-xargs 'exec-plus)
                          (format "%s <D> <X> -type f <F> -exec %s %s{} +"
-                                 grep-find-program gcmd null))
+                                 find-program gcmd null))
                         (t
                          (format "%s <D> <X> -type f <F> -print | \"%s\" %s"
-                                 grep-find-program grep-xargs-program gcmd))))))))
+                                 find-program xargs-program gcmd))))))))
 
     ;; Save defaults for this host.
     (setq grep-host-defaults-alist
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 82059c91363..9c8a88c80fc 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -162,7 +162,7 @@ end it with `/'.  DIR must be one of `project-roots' or
 DIRS is a list of absolute directories; it should be some
 subset of the project roots and external roots.
 
-The default implementation uses `grep-find-program'.  PROJECT is used
+The default implementation uses `find-program'.  PROJECT is used
 to find the list of ignores for each directory."
   ;; FIXME: Uniquely abbreviate the roots?
   (require 'xref)
@@ -171,7 +171,7 @@ to find the list of ignores for each directory."
           (lambda (dir)
             (let ((command
                    (format "%s %s %s -type f -print0"
-                           grep-find-program
+                           find-program
                            dir
                            (xref--find-ignores-arguments
                             (project-ignores project dir)
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 714de9230e7..d1a08ab2623 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -72,13 +72,15 @@ to invoke `tmm-menubar' instead, customize the variable
      (tmm-get-keybind [menu-bar]))
     (setq menu-bar `(keymap ,@(nreverse menu-bar) ,@(nreverse menu-end)))
     (if x-position
-        (let ((column 0))
+        (let ((column 0)
+              prev-key)
           (catch 'done
             (map-keymap
              (lambda (key binding)
                (when (> column x-position)
-                 (setq menu-bar-item key)
+                 (setq menu-bar-item prev-key)
                  (throw 'done nil))
+               (setq prev-key key)
                (pcase binding
                  ((or `(,(and (pred stringp) name) . ,_) ;Simple menu item.
                       `(menu-item ,name ,_cmd            ;Extended menu item.
@@ -187,7 +189,6 @@ Its value should be an event that has a binding in MENU."
          ((vectorp elt)
           (dotimes (i (length elt))
             (tmm-get-keymap (cons i (aref elt i)) not-menu))))))
-    (setq tmm-km-list (nreverse tmm-km-list))
     ;; Choose an element of tmm-km-list; put it in choice.
     (if (and not-menu (= 1 (length tmm-km-list)))
         ;; If this is the top-level of an x-popup-menu menu,
@@ -239,10 +240,17 @@ Its value should be an event that has a binding in MENU."
                    (if default-item
                        (car (nth index-of-default tmm-km-list))
                      (minibuffer-with-setup-hook #'tmm-add-prompt
+                       ;; tmm-km-list is reversed, because history
+                       ;; needs it in LIFO order.  But completion
+                       ;; needs it in non-reverse order, so that the
+                       ;; menu items are displayed as completion
+                       ;; candidates in the order they are shown on
+                       ;; the menu bar.  So pass completing-read the
+                       ;; reversed copy of the list.
                        (completing-read
                         (concat gl-str
                                 " (up/down to change, PgUp to menu): ")
-                        (tmm--completion-table tmm-km-list) nil t nil
+                        (tmm--completion-table (reverse tmm-km-list)) nil t nil
                         (cons 'tmm--history
                               (- (* 2 history-len) index-of-default))))))))
       (setq choice (cdr (assoc out tmm-km-list)))
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 34ffb3c93b5..63d50033eec 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -542,7 +542,7 @@ If called interactively, visit the version at point."
       (setq en (point))
       (or (log-view-current-entry nil t)
           (throw 'beginning-of-buffer nil))
-      (cond ((memq backend '(SCCS RCS CVS MCVS SVN))
+      (cond ((memq backend '(SCCS RCS CVS SVN))
              (forward-line 2))
             ((eq backend 'Hg)
              (forward-line 4)
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 0535565db28..4047bca046a 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -122,7 +122,7 @@ An empty list disables VC altogether."
   :group 'vc)
 
 ;; Note: we don't actually have a darcs back end yet.
-;; Also, Meta-CVS (corresponding to MCVS) and Arch are unsupported.
+;; Also, Arch is unsupported, and the Meta-CVS back end has been removed.
 ;; The Arch back end will be retrieved and fixed if it is ever required.
 (defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS"
                                          ".src" ".svn" ".git" ".hg" ".bzr"