[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0b7836d 2/2: Don't bug out on nil `patch-buf' argum
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 0b7836d 2/2: Don't bug out on nil `patch-buf' arguments |
Date: |
Sun, 20 Mar 2016 11:22:08 +0000 |
branch: master
commit 0b7836dda668a64577778d05ce02d65301bb631b
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
Don't bug out on nil `patch-buf' arguments
* lisp/vc/ediff.el (ediff-patch-file): Don't bug out on nil
`patch-buf' arguments.
---
lisp/vc/ediff.el | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index be4ced9..a4244c9 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1367,8 +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))
- (get-buffer patch-buf)))
+ (and arg (prefix-numeric-value arg))
+ (and patch-buf (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))