summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2001-05-03 07:51:23 +0000
committerEli Zaretskii <eliz@gnu.org>2001-05-03 07:51:23 +0000
commita1af8dcf17517e1016f8245c658046f9be4a16bf (patch)
tree1aec94807d30f333a9baca9d94dcf8d2e5a4945a
parentddfb4005866a4695de02147bc9309c863c2c171e (diff)
downloademacs-a1af8dcf17517e1016f8245c658046f9be4a16bf.tar.gz
(dired-diff): Doc fix.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/dired-aux.el3
-rw-r--r--lisp/dired.el3
3 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8052faab73e..cc3c9c04522 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
2001-05-03 Eli Zaretskii <eliz@is.elta.co.il>
+ * dired-aux.el (dired-diff): Doc fix.
+
+ * dired.el (dired-diff): Likewise.
+
+2001-05-03 Eli Zaretskii <eliz@is.elta.co.il>
+
* textmodes/ispell.el (ispell-change-dictionary): Doc fix.
2001-05-02 Stefan Monnier <monnier@cs.yale.edu>
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 6651f9c832a..31883fe012a 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -44,7 +44,8 @@
;;;###autoload
(defun dired-diff (file &optional switches)
"Compare file at point with file FILE using `diff'.
-FILE defaults to the file at the mark.
+FILE defaults to the file at the mark. (That's the mark set by
+\\[set-mark-command], not by Dired's \\[dired-mark] command.)
The prompted-for file is the first file given to `diff'.
With prefix arg, prompt for second argument SWITCHES,
which is options for `diff'."
diff --git a/lisp/dired.el b/lisp/dired.el
index 6ef7990084d..a425cf384f3 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2716,7 +2716,8 @@ To be called first in body of `dired-sort-other', etc."
(autoload 'dired-diff "dired-aux"
"Compare file at point with file FILE using `diff'.
-FILE defaults to the file at the mark.
+FILE defaults to the file at the mark. (That's the mark set by
+\\[set-mark-command], not by Dired's \\[dired-mark] command.)
The prompted-for file is the first file given to `diff'."
t)