diff options
| author | Lars Magne Ingebrigtsen | 2016-03-20 12:12:27 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2016-03-20 12:12:27 +0100 |
| commit | 0b7836dda668a64577778d05ce02d65301bb631b (patch) | |
| tree | ab8618d86788d7362713321b4a963c35d3e7de9e /lisp | |
| parent | 6e70769e311e5614ceeb2e66483b33af4ad432c6 (diff) | |
| download | emacs-0b7836dda668a64577778d05ce02d65301bb631b.tar.gz emacs-0b7836dda668a64577778d05ce02d65301bb631b.zip | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | 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 be4ced9b55f..a4244c941d2 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el | |||
| @@ -1367,8 +1367,8 @@ buffer. If odd -- assume it is in a file." | |||
| 1367 | (require 'ediff-ptch) | 1367 | (require 'ediff-ptch) |
| 1368 | (setq patch-buf | 1368 | (setq patch-buf |
| 1369 | (ediff-get-patch-buffer | 1369 | (ediff-get-patch-buffer |
| 1370 | (if arg (prefix-numeric-value arg)) | 1370 | (and arg (prefix-numeric-value arg)) |
| 1371 | (get-buffer patch-buf))) | 1371 | (and patch-buf (get-buffer patch-buf)))) |
| 1372 | (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch) | 1372 | (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch) |
| 1373 | ((and (not ediff-patch-default-directory) | 1373 | ((and (not ediff-patch-default-directory) |
| 1374 | (buffer-file-name patch-buf)) | 1374 | (buffer-file-name patch-buf)) |