aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Rost2002-09-09 01:43:31 +0000
committerMarkus Rost2002-09-09 01:43:31 +0000
commitab9ecc746ba0332172ef5b06dee69b1210f37b0e (patch)
tree4d4fbdf2870690ae8a8ceaa5aa90bc1f3a3110f7
parentcd91e34cb48cabe2a3e9a295a9f5eaf3b9e298d0 (diff)
downloademacs-ab9ecc746ba0332172ef5b06dee69b1210f37b0e.tar.gz
emacs-ab9ecc746ba0332172ef5b06dee69b1210f37b0e.zip
(diff): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/diff.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da856914d32..84f27ce5eb6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12002-09-08 Markus Rost <rost@math.ohio-state.edu>
2
3 * diff.el (diff): Doc fix.
4
12002-09-08 Richard M. Stallman <rms@gnu.org> 52002-09-08 Richard M. Stallman <rms@gnu.org>
2 6
3 * emacs-lisp/bytecomp.el (byte-compile-delete-errors): Default to nil. 7 * emacs-lisp/bytecomp.el (byte-compile-delete-errors): Default to nil.
diff --git a/lisp/diff.el b/lisp/diff.el
index 06387062feb..a5fa7026505 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -195,7 +195,7 @@ is nil, REGEXP matches only half a hunk.")
195Interactively the current buffer's file name is the default for NEW 195Interactively the current buffer's file name is the default for NEW
196and a backup file for NEW is the default for OLD. 196and a backup file for NEW is the default for OLD.
197With prefix arg, prompt for diff switches. 197With prefix arg, prompt for diff switches.
198If NO-ASYNC is non-nil, call diff syncrhonously." 198If NO-ASYNC is non-nil, call diff synchronously."
199 (interactive 199 (interactive
200 (nconc 200 (nconc
201 (let (oldf newf) 201 (let (oldf newf)