diff options
| author | K. Handa | 2015-09-01 20:46:15 +0900 |
|---|---|---|
| committer | K. Handa | 2015-09-01 20:46:15 +0900 |
| commit | 3e0e2339cd379eeba8d9bc758f2e8e574144e252 (patch) | |
| tree | 9d119efed6e52e5c24dbd84836148157271799a8 /lisp/vc/ediff-diff.el | |
| parent | 524eeb2e5e158d98ea52fe5ebe4768c4433ba8b2 (diff) | |
| parent | ff0a92f6461941902eb9e974bdd2ff9adacb7bc4 (diff) | |
| download | emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.tar.gz emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/vc/ediff-diff.el')
| -rw-r--r-- | lisp/vc/ediff-diff.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index b3093943d4e..352892c945a 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -1373,7 +1373,7 @@ affects only files whose names match the expression." | |||
| 1373 | ;; Normalize empty filter RE to nil. | 1373 | ;; Normalize empty filter RE to nil. |
| 1374 | (unless (> (length filter-re) 0) (setq filter-re nil)) | 1374 | (unless (> (length filter-re) 0) (setq filter-re nil)) |
| 1375 | ;; Indicate progress | 1375 | ;; Indicate progress |
| 1376 | (message "Comparing ‘%s’ and ‘%s’ modulo ‘%s’" d1 d2 filter-re) | 1376 | (message "Comparing `%s' and `%s' modulo `%s'" d1 d2 filter-re) |
| 1377 | (cond | 1377 | (cond |
| 1378 | ;; D1 & D2 directories => recurse | 1378 | ;; D1 & D2 directories => recurse |
| 1379 | ((and (file-directory-p d1) | 1379 | ((and (file-directory-p d1) |