aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-05-03 07:51:23 +0000
committerEli Zaretskii2001-05-03 07:51:23 +0000
commita1af8dcf17517e1016f8245c658046f9be4a16bf (patch)
tree1aec94807d30f333a9baca9d94dcf8d2e5a4945a
parentddfb4005866a4695de02147bc9309c863c2c171e (diff)
downloademacs-a1af8dcf17517e1016f8245c658046f9be4a16bf.tar.gz
emacs-a1af8dcf17517e1016f8245c658046f9be4a16bf.zip
(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 @@
12001-05-03 Eli Zaretskii <eliz@is.elta.co.il> 12001-05-03 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * dired-aux.el (dired-diff): Doc fix.
4
5 * dired.el (dired-diff): Likewise.
6
72001-05-03 Eli Zaretskii <eliz@is.elta.co.il>
8
3 * textmodes/ispell.el (ispell-change-dictionary): Doc fix. 9 * textmodes/ispell.el (ispell-change-dictionary): Doc fix.
4 10
52001-05-02 Stefan Monnier <monnier@cs.yale.edu> 112001-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 @@
44;;;###autoload 44;;;###autoload
45(defun dired-diff (file &optional switches) 45(defun dired-diff (file &optional switches)
46 "Compare file at point with file FILE using `diff'. 46 "Compare file at point with file FILE using `diff'.
47FILE defaults to the file at the mark. 47FILE defaults to the file at the mark. (That's the mark set by
48\\[set-mark-command], not by Dired's \\[dired-mark] command.)
48The prompted-for file is the first file given to `diff'. 49The prompted-for file is the first file given to `diff'.
49With prefix arg, prompt for second argument SWITCHES, 50With prefix arg, prompt for second argument SWITCHES,
50 which is options for `diff'." 51 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."
2716 2716
2717(autoload 'dired-diff "dired-aux" 2717(autoload 'dired-diff "dired-aux"
2718 "Compare file at point with file FILE using `diff'. 2718 "Compare file at point with file FILE using `diff'.
2719FILE defaults to the file at the mark. 2719FILE defaults to the file at the mark. (That's the mark set by
2720\\[set-mark-command], not by Dired's \\[dired-mark] command.)
2720The prompted-for file is the first file given to `diff'." 2721The prompted-for file is the first file given to `diff'."
2721 t) 2722 t)
2722 2723