procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't bug out on nil `patch-buf' arguments

Browse source 
* lisp/vc/ediff.el (ediff-patch-file): Don't bug out on nil
`patch-buf' arguments.
This commit is contained in:
Lars Magne Ingebrigtsen 2016-03-20 12:12:27 +01:00
parent 6e70769e31
commit 0b7836dda6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/vc/ediff.el
View file

@ -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))