diff options
| author | Dima Kogan <dima@secretsauce.net> | 2016-11-23 18:04:21 -0800 |
|---|---|---|
| committer | Dima Kogan <dima@secretsauce.net> | 2016-11-23 18:05:35 -0800 |
| commit | dfc5b0f65531ef71cbd2c0cc956c246ea4239612 (patch) | |
| tree | ac3a3f38b082b13bd0f39daa377fbd5b5f25b1d5 /lisp/vc/ediff-mult.el | |
| parent | 561ce852ad0a90aac07fd16cd591ca8a408043c3 (diff) | |
| download | emacs-dfc5b0f65531ef71cbd2c0cc956c246ea4239612.tar.gz emacs-dfc5b0f65531ef71cbd2c0cc956c246ea4239612.tar.bz2 emacs-dfc5b0f65531ef71cbd2c0cc956c246ea4239612.zip | |
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
Diffstat (limited to 'lisp/vc/ediff-mult.el')
| -rw-r--r-- | lisp/vc/ediff-mult.el | 6 |
1 files changed, 3 insertions, 3 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 |