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

Fix ediff-toggle-multiframe cond clauses

Browse source 
* lisp/vc/ediff-util.el (ediff-toggle-multiframe): Remove duplicate
cond clause.  Fix parentheses so that trailing 'message' is
contained in fallback clause.  Fix indentation.
This commit is contained in:
Basil L. Contovounesios 2023-09-26 10:12:28 +02:00
parent ff2a02afa6
commit 8d7e498366
1 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1269,36 +1269,28 @@ which see."
(or (display-graphic-p)
(user-error "Emacs is not running as a window application"))
(cond ((eq ediff-window-setup-function #'ediff-setup-windows-multiframe)
(setq ediff-multiframe nil)
(setq window-setup-func #'ediff-setup-windows-plain)
(message "ediff is now in `plain' mode"))
((eq ediff-window-setup-function #'ediff-setup-windows-plain)
(if (and (ediff-buffer-live-p ediff-control-buffer)
(window-live-p ediff-control-window))
(set-window-dedicated-p ediff-control-window nil))
(setq ediff-multiframe t)
(setq window-setup-func #'ediff-setup-windows-multiframe)
(message "ediff is now in `multiframe' mode"))
(t
(if (and (ediff-buffer-live-p ediff-control-buffer)
(window-live-p ediff-control-window))
(set-window-dedicated-p ediff-control-window nil))
(setq ediff-multiframe t)
(setq window-setup-func #'ediff-setup-windows-multiframe))
(message "ediff is now in `multiframe' mode"))
(cond ((eq ediff-window-setup-function #'ediff-setup-windows-multiframe)
(setq ediff-multiframe nil)
(setq window-setup-func #'ediff-setup-windows-plain)
(message "ediff is now in `plain' mode"))
(t ; (eq ediff-window-setup-function #'ediff-setup-windows-plain)
(if (and (ediff-buffer-live-p ediff-control-buffer)
(window-live-p ediff-control-window))
(set-window-dedicated-p ediff-control-window nil))
(setq ediff-multiframe t)
(setq window-setup-func #'ediff-setup-windows-multiframe)
(message "ediff is now in `multiframe' mode")))
;; change default
(setq-default ediff-window-setup-function window-setup-func)
;; change in all active ediff sessions
(mapc (lambda(buf) (ediff-with-current-buffer buf
(setq ediff-window-setup-function window-setup-func
ediff-window-B nil)))
ediff-session-registry)
(if (ediff-in-control-buffer-p)
(progn
(set-window-dedicated-p (selected-window) nil)
(ediff-recenter 'no-rehighlight)))))
;; change default
(setq-default ediff-window-setup-function window-setup-func)
;; change in all active ediff sessions
(mapc (lambda (buf) (ediff-with-current-buffer buf
(setq ediff-window-setup-function window-setup-func
ediff-window-B nil)))
ediff-session-registry)
(when (ediff-in-control-buffer-p)
(set-window-dedicated-p (selected-window) nil)
(ediff-recenter 'no-rehighlight))))
;;;###autoload