From: Tino Calancha <f92capac@gmail.com>
Date: Tue, 23 Feb 2016 05:04:06 +0000 (+1100)
Subject: Require that the buffer that we're trying to patch exist
X-Git-Tag: emacs-26.0.90~2501
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d21540646b7272b069aa6909d41978171c9e06c;p=emacs.git

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
---

diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 71099ab4d6e..e5e16a12f96 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