Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

`diff' doc clarification

Browse source 
* vc/diff.el (diff): Clarify the order the file names are read
(bug#7111).
This commit is contained in:
Lars Magne Ingebrigtsen 2011-07-14 16:15:06 +02:00
parent b8151e9c3c
commit fc233c9d7e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
* vc/diff.el (diff): Clarify the order the file names are read
(bug#7111).
* mouse.el (mouse-set-region): Link to `mouse-drag-copy-region' in
the doc string (bug#7015).

8
lisp/vc/diff.el
View file

@ -76,10 +76,10 @@ delete the temporary files so named."
;;;###autoload
(defun diff (old new &optional switches no-async)
"Find and display the differences between OLD and NEW files.
When called interactively, read OLD and NEW using the minibuffer;
the default for NEW is the current buffer's file name, and the
default for OLD is a backup file for NEW, if one exists.
If NO-ASYNC is non-nil, call diff synchronously.
When called interactively, read NEW, then OLD, using the
minibuffer. The default for NEW is the current buffer's file
name, and the default for OLD is a backup file for NEW, if one
exists. If NO-ASYNC is non-nil, call diff synchronously.
When called interactively with a prefix argument, prompt
interactively for diff switches. Otherwise, the switches