Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
be958f1d
Commit
be958f1d
authored
Jul 11, 2011
by
Lars Magne Ingebrigtsen
Browse files
(ediff-patch-file): Clarify doc string
Fixes: debbugs:3138
parent
5bedb26c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
lisp/ChangeLog
lisp/ChangeLog
+2
-0
lisp/vc/ediff.el
lisp/vc/ediff.el
+1
-1
No files found.
lisp/ChangeLog
View file @
be958f1d
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.
...
...
lisp/vc/ediff.el
View file @
be958f1d
...
...
@@ -1348,7 +1348,7 @@ buffer."
;;;###autoload
(
defun
ediff-patch-file
(
&optional
arg
patch-buf
)
"
R
un Ediff by patching
SOURCE-FILENAME
.
"
Query for a file name, and then r
un 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment