projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5214e7
)
Require that the buffer that we're trying to patch exist
author
Tino Calancha
<f92capac@gmail.com>
Tue, 23 Feb 2016 05:04:06 +0000
(16:04 +1100)
committer
Lars Ingebrigtsen
<larsi@gnus.org>
Tue, 23 Feb 2016 05:04:06 +0000
(16:04 +1100)
* lisp/vc/ediff.el (ediff-patch-buffer): Require that the
buffer that we're trying to patch exist (bug#21852).
Copyright-paperwork-exempt: yes
lisp/vc/ediff.el
patch
|
blob
|
history
diff --git
a/lisp/vc/ediff.el
b/lisp/vc/ediff.el
index 71099ab4d6e5c7e5ea5443033faa3ef1e4124576..e5e16a12f967b32daa3b36eb472d5b47dfef6bea 100644
(file)
--- a/
lisp/vc/ediff.el
+++ b/
lisp/vc/ediff.el
@@
-1401,9
+1401,8
@@
patch. If not given, the user is prompted according to the prefix argument."
(if arg (prefix-numeric-value arg)) patch-buf))
(ediff-patch-buffer-internal
patch-buf
- (read-buffer
- "Which buffer to patch? "
- (ediff-other-buffer patch-buf))))
+ (read-buffer "Which buffer to patch? " (ediff-other-buffer patch-buf)
+ 'require-match)))
;;;###autoload