aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-01 14:48:02 +0200
committerLars Magne Ingebrigtsen2011-07-01 14:48:02 +0200
commitace6c69c026717404139ab2935a2a15d17e7103a (patch)
tree7ed8b79010de35e1a405e5d72123913cad3e755b
parent191e2bedb94e3d34a017bff0706aeeb22ee29ec0 (diff)
downloademacs-ace6c69c026717404139ab2935a2a15d17e7103a.tar.gz
emacs-ace6c69c026717404139ab2935a2a15d17e7103a.zip
* dired-aux.el (dired-diff): Doc fixup (bug#8816).
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/dired-aux.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cee146a3ef..a8893d9da82 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-07-01 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * dired-aux.el (dired-diff): Doc fixup (bug#8816).
4
3 * dired.el (dired-mode): Fix up the doc string as suggested by 5 * dired.el (dired-mode): Fix up the doc string as suggested by
4 Drew Adams (bug#8817). 6 Drew Adams (bug#8817).
5 7
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 8e4b3b5c6a6..f9c6000a047 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -56,9 +56,9 @@ into this list; they also should call `dired-log' to log the errors.")
56 "Compare file at point with file FILE using `diff'. 56 "Compare file at point with file FILE using `diff'.
57FILE defaults to the file at the mark. (That's the mark set by 57FILE defaults to the file at the mark. (That's the mark set by
58\\[set-mark-command], not by Dired's \\[dired-mark] command.) 58\\[set-mark-command], not by Dired's \\[dired-mark] command.)
59The prompted-for file is the first file given to `diff'. 59The prompted-for FILE is the first file given to `diff'.
60With prefix arg, prompt for second argument SWITCHES, 60With prefix arg, prompt for second argument SWITCHES,
61which is options for `diff'." 61which is the string of command switches for `diff'."
62 (interactive 62 (interactive
63 (let* ((current (dired-get-filename t)) 63 (let* ((current (dired-get-filename t))
64 ;; Get the file at the mark. 64 ;; Get the file at the mark.