summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>1996-12-28 02:53:04 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>1996-12-28 02:53:04 +0000
commitbf5d92c5e3c9eccf0adbf150c70bc4e656c7aa01 (patch)
tree710e2d34c85a2982384a996efb2ccffb6d523843 /lisp/ediff.el
parent469b44cbf1916dc9502d4356e8fce0081809f585 (diff)
downloademacs-bf5d92c5e3c9eccf0adbf150c70bc4e656c7aa01.tar.gz
*** empty log message ***
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index be9c1d143d4..9c4c8cec3e5 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -566,7 +566,7 @@ can be used to filter out certain file names."
The second argument, REGEXP, is a regular expression that filters the file
names. Only the files that are under revision control are taken into account."
(interactive
- (let* ((dir-A (ediff-get-default-directory-name)))
+ (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: "
@@ -585,7 +585,7 @@ names. Only the files that are under revision control are taken into account."
The second argument, REGEXP, is a regular expression that filters the file
names. Only the files that are under revision control are taken into account."
(interactive
- (let* ((dir-A (ediff-get-default-directory-name)))
+ (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: "