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

Make ediff-show-diff-output work better on unsaved buffers

Browse source 
* lisp/vc/ediff-util.el (ediff-show-diff-output): Make the `D'
command work on unsaved buffers without a prefix (bug#45016).
This commit is contained in:
Lars Ingebrigtsen 2022-05-09 14:06:24 +02:00
parent d377b39643
commit 8a8b81c1e4
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/vc/ediff-util.el
View file

@ -3431,6 +3431,9 @@ Without an argument, it saves customized diff argument, if available
))
(defun ediff-show-diff-output (arg)
"With prefix argument ARG, show plain diff output.
Without an argument, it saves customized diff argument, if available
(and plain output, if customized output was not generated)."
(interactive "P")
(ediff-barf-if-not-control-buffer)
(ediff-compute-custom-diffs-maybe)
@ -3438,7 +3441,10 @@ Without an argument, it saves customized diff argument, if available
(ediff-skip-unsuitable-frames ' ok-unsplittable))
(let ((buf (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
ediff-diff-buffer)
((ediff-buffer-live-p ediff-custom-diff-buffer)
((and (ediff-buffer-live-p ediff-custom-diff-buffer)
;; We may not have gotten a custom output if
;; we're working on unsaved buffers.
(> (buffer-size ediff-custom-diff-buffer) 0))
ediff-custom-diff-buffer)
((ediff-buffer-live-p ediff-diff-buffer)
ediff-diff-buffer)