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

ediff-current-file: New optional startup-hooks arg

Browse source 
* lisp/vc/ediff.el (ediff-current-file): Add optional
startup-hooks argument, so that the user can write wrapper
commands with more finely customized behavior (bug#77323).
This commit is contained in:
Paul D. Nelson 2025-03-31 09:07:07 +02:00 • committed by Sean Whitton
parent 1fdaad5253
commit 2bced74aa9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/vc/ediff.el
View file

@ -360,10 +360,13 @@ has been saved (if not in `buffer-file-name')."
(defalias 'ediff #'ediff-files)
;;;###autoload
(defun ediff-current-file ()
(defun ediff-current-file (&optional startup-hooks)
"Start ediff between current buffer and its file on disk.
This command can be used instead of `revert-buffer'. If there is
nothing to revert then this command fails."
nothing to revert then this command fails.
Non-interactively, STARTUP-HOOKS is a list of functions that Emacs calls
without arguments after setting up the Ediff buffers."
(interactive)
;; This duplicates code from menu-bar.el.
(unless (or (not (eq revert-buffer-function 'revert-buffer--default))
@ -395,7 +398,7 @@ nothing to revert then this command fails."
(insert-file-contents file-name)
;; Assume same modes:
(funcall current-major))
(ediff-buffers revert-buf (current-buffer))))
(ediff-buffers revert-buf (current-buffer) startup-hooks)))
;;;###autoload