Clarify ediff-directories prompt

* lisp/vc/ediff-mult.el (ediff-filegroup-action):
* lisp/vc/ediff.el (ediff-directories,ediff-directory-revisions,
ediff-directories3, ediff-merge-directories,
ediff-merge-directories-with-ancestor, ediff-merge-directory-revisions,
ediff-merge-directory-revisions-with-ancestor): Clarify prompt message for
filename filter in interactive ediff. The new message makes it clear what is
being filtered

2 files changed, 17 insertions, 17 deletions

diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 7f0db5d45dc..9c7e278e6ab 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -1846,9 +1846,9 @@ all marked sessions must be active."
                      (read-string
                       (if (stringp default-regexp)
                           (format
-                           "Filter through regular expression (default %s): "
+                           "Filter filenames through regular expression (default %s): "
                            default-regexp)
-                        "Filter through regular expression: ")
+                        "Filter filenames through regular expression: ")
                       nil
                       'ediff-filtering-regexp-history
                       (eval ediff-default-filtering-regexp)))
@@ -1872,7 +1872,7 @@ all marked sessions must be active."
                   (file-directory-p file1))
              (if (ediff-buffer-live-p session-buf)
                  (ediff-show-meta-buffer session-buf)
-               (setq regexp (read-string "Filter through regular expression: "
+               (setq regexp (read-string "Filter filenames through regular expression: "
                                          nil 'ediff-filtering-regexp-history))
                (ediff-directory-revisions-internal
                 file1 regexp
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index a4244c941d2..ed36a3fc8c1 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -553,9 +553,9 @@ expression; only file names that match the regexp are considered."
                            nil 'must-match)
            (read-string
             (if (stringp default-regexp)
-                (format "Filter through regular expression (default %s): "
+                (format "Filter filenames through regular expression (default %s): "
                          default-regexp)
-              "Filter through regular expression: ")
+              "Filter filenames through regular expression: ")
             nil
             'ediff-filtering-regexp-history
             (eval ediff-default-filtering-regexp))
@@ -581,9 +581,9 @@ names.  Only the files that are under revision control are taken into account."
             "Directory to compare with revision:" dir-A nil 'must-match)
            (read-string
             (if (stringp default-regexp)
-                (format "Filter through regular expression (default %s): "
+                (format "Filter filenames through regular expression (default %s): "
                          default-regexp)
-              "Filter through regular expression: ")
+              "Filter filenames through regular expression: ")
             nil
             'ediff-filtering-regexp-history
             (eval ediff-default-filtering-regexp))
@@ -619,9 +619,9 @@ regular expression; only file names that match the regexp are considered."
                            nil 'must-match)
            (read-string
             (if (stringp default-regexp)
-                (format "Filter through regular expression (default %s): "
+                (format "Filter filenames through regular expression (default %s): "
                          default-regexp)
-              "Filter through regular expression: ")
+              "Filter filenames through regular expression: ")
             nil
             'ediff-filtering-regexp-history
             (eval ediff-default-filtering-regexp))
@@ -651,9 +651,9 @@ expression; only file names that match the regexp are considered."
                            nil 'must-match)
            (read-string
             (if (stringp default-regexp)
-                (format "Filter through regular expression (default %s): "
+                (format "Filter filenames through regular expression (default %s): "
                          default-regexp)
-              "Filter through regular expression: ")
+              "Filter filenames through regular expression: ")
             nil
             'ediff-filtering-regexp-history
             (eval ediff-default-filtering-regexp))
@@ -692,9 +692,9 @@ only file names that match the regexp are considered."
                                  nil 'must-match)
            (read-string
             (if (stringp default-regexp)
-                (format "Filter through regular expression (default %s): "
+                (format "Filter filenames through regular expression (default %s): "
                          default-regexp)
-              "Filter through regular expression: ")
+              "Filter filenames through regular expression: ")
             nil
             'ediff-filtering-regexp-history
             (eval ediff-default-filtering-regexp))
@@ -719,9 +719,9 @@ names.  Only the files that are under revision control are taken into account."
             "Directory to merge with revisions:" dir-A nil 'must-match)
            (read-string
             (if (stringp default-regexp)
-                (format "Filter through regular expression (default %s): "
+                (format "Filter filenames through regular expression (default %s): "
                          default-regexp)
-              "Filter through regular expression: ")
+              "Filter filenames through regular expression: ")
             nil
             'ediff-filtering-regexp-history
             (eval ediff-default-filtering-regexp))
@@ -750,9 +750,9 @@ names.  Only the files that are under revision control are taken into account."
             dir-A nil 'must-match)
            (read-string
             (if (stringp default-regexp)
-                (format "Filter through regular expression (default %s): "
+                (format "Filter filenames through regular expression (default %s): "
                          default-regexp)
-              "Filter through regular expression: ")
+              "Filter filenames through regular expression: ")
             nil
             'ediff-filtering-regexp-history
             (eval ediff-default-filtering-regexp))