emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/backports-25.2 b16e6c3 09/46: Require that the buf


From: Noam Postavsky
Subject: [Emacs-diffs] scratch/backports-25.2 b16e6c3 09/46: Require that the buffer that we're trying to patch exist
Date: Sun, 2 Oct 2016 14:04:47 +0000 (UTC)

branch: scratch/backports-25.2
commit b16e6c3230c798ad8c4625f6612a826b5d4ea8e0
Author: Lars Ingebrigtsen <address@hidden>
Commit: Noam Postavsky <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).
    
    (cherry picked from commit 92da003692b894e6dc514e3a56a1861849dcad8c)
---
 lisp/vc/ediff.el |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index e5e16a1..be4ced9 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]