From be958f1d65a2d843b35824dfe30db24b616f6b21 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 11 Jul 2011 17:03:24 +0200 Subject: [PATCH] (ediff-patch-file): Clarify doc string Fixes: debbugs:3138 --- lisp/ChangeLog | 2 ++ lisp/vc/ediff.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 + * 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 -- 2.39.5