From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 23 Feb 2016 05:09:06 +0000 (+1100)
Subject: Require that the buffer that we're trying to patch exist
X-Git-Tag: emacs-26.0.90~2500
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92da003692b894e6dc514e3a56a1861849dcad8c;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).
---

diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index e5e16a12f96..be4ced9b55f 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1367,7 +1367,8 @@ buffer. If odd -- assume it is in a file."
     (require 'ediff-ptch)
     (setq patch-buf
 	  (ediff-get-patch-buffer
-	   (if arg (prefix-numeric-value arg)) patch-buf))
+	   (if arg (prefix-numeric-value arg))
+           (get-buffer patch-buf)))
     (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch)
 			   ((and (not ediff-patch-default-directory)
 				 (buffer-file-name patch-buf))