From 03093baf9093c0e855915da5085d272b11588a75 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 12 Sep 2020 13:08:29 +0200 Subject: [PATCH] diff-no-select doc string clarification * lisp/vc/diff.el (diff-no-select): Update doc string from the trunk, don't merge. --- lisp/vc/diff.el | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 9e7e771963c..469888078c4 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -145,9 +145,17 @@ Possible values are: (defun diff-no-select (old new &optional switches no-async buf) ;; 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 old) (setq old (expand-file-name old))) (or switches (setq switches diff-switches)) ; If not specified, use default.