diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2003-05-18 17:18:09 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2003-05-18 17:18:09 +0000 |
| commit | 6e31f65f1639b7740cfb85c8320d80110f5eeeab (patch) | |
| tree | fecacdf006f759c7912d5acc96189d7004fafd55 /lisp/ediff.el | |
| parent | 4dd68254fbdd72e492b6537607e489ba14e4cac8 (diff) | |
| download | emacs-6e31f65f1639b7740cfb85c8320d80110f5eeeab.tar.gz | |
2003-05-18 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-mult.el (ediff-default-filtering-regexp): new variable.
* ediff-util.el (ediff-maybe-save-and-delete-merge): change in a
message.
* 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): make use of the new
ediff-default-filtering-regexp variable.
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index 2525a07658e..edc16265b02 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -7,7 +7,7 @@ ;; Keywords: comparing, merging, patching, tools, unix (defconst ediff-version "2.78" "The current version of Ediff") -(defconst ediff-date "January 25, 2003" "Date of last update") +(defconst ediff-date "May 18, 2003" "Date of last update") ;; This file is part of GNU Emacs. @@ -508,8 +508,11 @@ expression; only file names that match the regexp are considered." ediff-last-dir-B (ediff-strip-last-dir f)) nil) - (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history) + (read-string (format + "Filter through regular expression (default %S): " + (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp) + 'ediff-filtering-regexp-history) ))) (ediff-directories-internal dir1 dir2 nil regexp 'ediff-files 'ediff-directories @@ -528,8 +531,11 @@ names. Only the files that are under revision control are taken into account." (let ((dir-A (ediff-get-default-directory-name))) (list (ediff-read-file-name "Directory to compare with revision:" dir-A nil) - (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history) + (read-string (format + "Filter through regular expression (default %S): " + (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp) + 'ediff-filtering-regexp-history) ))) (ediff-directory-revisions-internal dir1 regexp 'ediff-revision 'ediff-directory-revisions @@ -559,8 +565,11 @@ regular expression; only file names that match the regexp are considered." ediff-last-dir-C (ediff-strip-last-dir f)) nil) - (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history) + (read-string (format + "Filter through regular expression (default %S): " + (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp) + 'ediff-filtering-regexp-history) ))) (ediff-directories-internal dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3 @@ -583,8 +592,11 @@ expression; only file names that match the regexp are considered." ediff-last-dir-B (ediff-strip-last-dir f)) nil) - (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history) + (read-string (format + "Filter through regular expression (default %S): " + (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp) + 'ediff-filtering-regexp-history) ))) (ediff-directories-internal dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories @@ -617,8 +629,11 @@ only file names that match the regexp are considered." ediff-last-dir-C (ediff-strip-last-dir f)) nil) - (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history) + (read-string (format + "Filter through regular expression (default %S): " + (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp) + 'ediff-filtering-regexp-history) ))) (ediff-directories-internal dir1 dir2 ancestor-dir regexp @@ -636,8 +651,11 @@ names. Only the files that are under revision control are taken into account." (let ((dir-A (ediff-get-default-directory-name))) (list (ediff-read-file-name "Directory to merge with revisions:" dir-A nil) - (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history) + (read-string (format + "Filter through regular expression (default %S): " + (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp) + 'ediff-filtering-regexp-history) ))) (ediff-directory-revisions-internal dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions @@ -658,8 +676,11 @@ names. Only the files that are under revision control are taken into account." (let ((dir-A (ediff-get-default-directory-name))) (list (ediff-read-file-name "Directory to merge with revisions and ancestors:" dir-A nil) - (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history) + (read-string (format + "Filter through regular expression (default %S): " + (eval ediff-default-filtering-regexp)) + (eval ediff-default-filtering-regexp) + 'ediff-filtering-regexp-history) ))) (ediff-directory-revisions-internal dir1 regexp 'ediff-merge-revisions-with-ancestor |