mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

Be more verbose when changing frame mode in ediff

Browse Source 
* lisp/vc/ediff-util.el (ediff-toggle-multiframe): Say what
mode we toggled to (bug#21853).

Copyright-paperwork-exempt: yes
This commit is contained in:
Tino Calancha 2016-02-23 15:55:08 +11:00 committed by Lars Ingebrigtsen
parent 3cedbdcc71
commit c5214e7969
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1293,7 +1293,8 @@ which see."
(cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
(setq ediff-multiframe nil)
(setq window-setup-func 'ediff-setup-windows-plain))
(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 (ediff-in-control-buffer-p)
(ediff-kill-bottom-toolbar))
@ -1301,14 +1302,15 @@ which see."
(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))
(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"))
;; change default
(setq-default ediff-window-setup-function window-setup-func)