[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
- [Emacs-diffs] branch scratch/backports-25.2 created (now eb5dd2c), Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 25895c4 02/46: Doc fix for url-http, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 2284444 08/46: Require that the buffer that we're trying to patch exist,
Noam Postavsky <=
- [Emacs-diffs] scratch/backports-25.2 7d89389 04/46: Make erc connect asynchronously, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 0d9709e 19/46: Meta + shift + Fn combos are recognized by xterm>=216., Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 5266c11 13/46: Allow more shell script defun forms, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 fbe5f7b 11/46: Completely ignore buffers with no name when copying file names, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 70244eb 15/46: Allow highlighting things like @math{2^{12}}, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 95d5520 12/46: Allow optional parameter to be nil, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 0780aa5 16/46: Replace XXX acronyms with draft standard ones, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 5f4c54b 18/46: Declare $ as an expression prefix in SCSS, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 344bc2b 17/46: Strip out some leading whitespace when looking at logs, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 69e0e89 23/46: Handle auth-source items with special characters on OS X, Noam Postavsky, 2016/10/02