mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

(ediff-patch-file): Clarify doc string

Browse Source 
Fixes: debbugs:3138
This commit is contained in:
Lars Magne Ingebrigtsen 2011-07-11 17:03:24 +02:00
parent 5bedb26cb8
commit be958f1d65
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
* vc/ediff.el (ediff-patch-file): Clarify doc string (bug#3138).
* cus-edit.el (custom-guess-name-alist): -alist variables should
use the `alist' type (bug#3120). Suggested by Drew Adams.

2
lisp/vc/ediff.el
View File

@ -1348,7 +1348,7 @@ buffer."
;;;###autoload
(defun ediff-patch-file (&optional arg patch-buf)
"Run Ediff by patching SOURCE-FILENAME.
"Query for a file name, and then run Ediff by patching that file.
If optional PATCH-BUF is given, use the patch in that buffer
and don't ask the user.
If prefix argument, then: if even argument, assume that the patch is in a