[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0d21540: Require that the buffer that we're trying
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 0d21540: Require that the buffer that we're trying to patch exist |
Date: |
Tue, 23 Feb 2016 05:04:20 +0000 |
branch: master
commit 0d21540646b7272b069aa6909d41978171c9e06c
Author: Tino Calancha <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Require that the buffer that we're trying to patch exist
* 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 | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 71099ab..e5e16a1 100644
--- 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0d21540: Require that the buffer that we're trying to patch exist,
Lars Ingebrigtsen <=