emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r105102: (ediff-patch-file): Clarify


From: Lars Magne Ingebrigtsen
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r105102: (ediff-patch-file): Clarify doc string
Date: Mon, 11 Jul 2011 17:03:24 +0200
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 105102
fixes bug(s): http://debbugs.gnu.org/3138
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2011-07-11 17:03:24 +0200
message:
  (ediff-patch-file): Clarify doc string
modified:
  lisp/ChangeLog
  lisp/vc/ediff.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-11 14:57:15 +0000
+++ b/lisp/ChangeLog    2011-07-11 15:03:24 +0000
@@ -1,5 +1,7 @@
 2011-07-11  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/vc/ediff.el'
--- a/lisp/vc/ediff.el  2011-01-25 04:08:28 +0000
+++ b/lisp/vc/ediff.el  2011-07-11 15:03:24 +0000
@@ -1348,7 +1348,7 @@
 
 ;;;###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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]