From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 11 Jul 2011 15:03:24 +0000 (+0200)
Subject: (ediff-patch-file): Clarify doc string
X-Git-Tag: emacs-pretest-24.0.90~104^2~381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be958f1d65a2d843b35824dfe30db24b616f6b21;p=emacs.git

(ediff-patch-file): Clarify doc string

Fixes: debbugs:3138
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ae1978b849..361b2d8087f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 5e352493dc9..464fdc0a589 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -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