diff options
| author | Michael Kifer <[email protected]> | 2003-10-13 01:28:49 +0000 |
|---|---|---|
| committer | Michael Kifer <[email protected]> | 2003-10-13 01:28:49 +0000 |
| commit | 81ef89602dcb5817f521e9a991034df7d9723f3b (patch) | |
| tree | ea56ad39e49e210af0d16e88e9361c83abc0808f /lisp/ediff-mult.el | |
| parent | a4887377a2f0b7983167bdcc06c35c632b1f223e (diff) | |
2003-10-12 Michael Kifer <[email protected]>
* ediff-mult.el (ediff-filegroup-action): use
ediff-default-filtering-regexp.
* ediff-util.el (ediff-recenter): don't call
ediff-restore-highlighting twice.
(ediff-select-difference): set current difference.
(ediff-unselect-and-select-difference): added comment.
* 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): use
ediff-default-filtering-regexp.
Diffstat (limited to 'lisp/ediff-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 536fdf4d47..f5eff1eb49 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -1689,6 +1689,7 @@ all marked sessions must be active." (info (ediff-get-meta-info meta-buf pos)) (session-buf (ediff-get-session-buffer info)) (session-number (ediff-get-session-number-at-pos pos meta-buf)) + (default-regexp (eval ediff-default-filtering-regexp)) merge-autostore-dir file1 file2 file3 regexp) (setq file1 (ediff-get-session-objA-name info) @@ -1717,8 +1718,16 @@ all marked sessions must be active." ;; do ediff/ediff-merge on subdirectories (if (ediff-buffer-live-p session-buf) (ediff-show-meta-buffer session-buf) - (setq regexp (read-string "Filter through regular expression: " - nil 'ediff-filtering-regexp-history)) + (setq regexp + (read-string + (if (stringp default-regexp) + (format + "Filter through regular expression (default %s): " + default-regexp) + "Filter through regular expression: ") + nil + 'ediff-filtering-regexp-history + (eval ediff-default-filtering-regexp))) (ediff-directories-internal file1 file2 file3 regexp ediff-session-action-function |