emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] scratch/backports-25.2 2284444 08/46: Require that the buf


From: Noam Postavsky
Subject: [Emacs-diffs] scratch/backports-25.2 2284444 08/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 2284444f0feb1863d463e14ad0b3aa5f637514c7
Author: Tino Calancha <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).
    
    Copyright-paperwork-exempt: yes
    (cherry picked from commit 0d21540646b7272b069aa6909d41978171c9e06c)
---
 lisp/vc/ediff.el |    5 ++---
 1 file 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



reply via email to

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