From: Eli Zaretskii Date: Thu, 3 May 2001 07:51:23 +0000 (+0000) Subject: (dired-diff): Doc fix. X-Git-Tag: emacs-pretest-21.0.103~58 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1af8dcf17517e1016f8245c658046f9be4a16bf;p=emacs.git (dired-diff): Doc fix. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8052faab73e..cc3c9c04522 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-05-03 Eli Zaretskii + + * dired-aux.el (dired-diff): Doc fix. + + * dired.el (dired-diff): Likewise. + 2001-05-03 Eli Zaretskii * textmodes/ispell.el (ispell-change-dictionary): Doc fix. 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)