[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))
- [Emacs-diffs] scratch/backports-25.2 cf54324 42/46: Improve error when installing non-package dirs, (continued)
- [Emacs-diffs] scratch/backports-25.2 cf54324 42/46: Improve error when installing non-package dirs, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 9e9f7c8 45/46: Don't --load directories, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 eb5dd2c 46/46: Don't require isearch-update before isearch-done, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 aad7ede 07/46: Ensure progress when fetching from the queue, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 87a7490 35/46: Clarify `read-face-name' doc and tweak the code, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 171ec16 44/46: Avoid error in icalendar--read-element, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 a33eb50 03/46: Let url use default file modes when copying files, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 30376cc 22/46: Allow _ characters in SQL prompts, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 145e369 05/46: Make the nsm query say what it did after the user interaction, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 e1e768e 01/46: Default web pages to right-to-left, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 b16e6c3 09/46: Require that the buffer that we're trying to patch exist,
Noam Postavsky <=
- [Emacs-diffs] scratch/backports-25.2 e2e25ae 20/46: Make <div> in <li> not insert extra newlines, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 77c3f7f 24/46: Make `q' etc work in image mode again, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 d7de0c4 25/46: smtpmail would say it's done before it is, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 f65b1a3 27/46: Don't consider colons to be paragraphs starting chars in strings, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 d95942f 29/46: Clean up custom-buffer-create code slightly, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 18f1ab7 30/46: Have describe-variable output multi-line values better, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 f24a305 26/46: Make `undo' of `C-x r t' put point where it should be, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 33b69a1 37/46: Warning fix in jit-lock-mode, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 8fd0223 06/46: Make mail-extract-address-components return the user name more, Noam Postavsky, 2016/10/02
- [Emacs-diffs] scratch/backports-25.2 7826f1f 32/46: Make ibuffer not break on newline-embedded buffer names, Noam Postavsky, 2016/10/02