mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-14 09:39:42 +00:00
Code Issues Releases Activity

diff-no-select doc string clarification

Browse Source 
* lisp/vc/diff.el (diff-no-select): Update doc string from the trunk,
don't merge.
This commit is contained in:
Lars Ingebrigtsen 2020-09-12 13:08:29 +02:00
parent 694acda5f2
commit 03093baf90
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/vc/diff.el
View File

@ -145,9 +145,17 @@ Possible values are:
(defun diff-no-select (old new &optional switches no-async buf) (defun diff-no-select (old new &optional switches no-async buf)
;; Noninteractive helper for creating and reverting diff buffers ;; Noninteractive helper for creating and reverting diff buffers
"Compare the OLD and NEW file/buffer, and return a diff buffer. "Compare the OLD and NEW file/buffer.
If the optional SWITCHES is nil, the switches specified in the
variable ‘diff-switches’ are passed to the diff command,
otherwise SWITCHES is used. SWITCHES can be a string or a list
of strings.
See `diff' for the meaning of the arguments." If NO-ASYNC is non-nil, call diff synchronously.
By default, this function creates the diff in the \"*Diff*\"
buffer. If BUF is non-nil, BUF is used instead. This function
returns the buffer used."
(unless (bufferp new) (setq new (expand-file-name new))) (unless (bufferp new) (setq new (expand-file-name new)))
(unless (bufferp old) (setq old (expand-file-name old))) (unless (bufferp old) (setq old (expand-file-name old)))
(or switches (setq switches diff-switches)) ; If not specified, use default. (or switches (setq switches diff-switches)) ; If not specified, use default.