aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTino Calancha2016-02-23 15:55:08 +1100
committerLars Ingebrigtsen2016-02-23 15:55:08 +1100
commitc5214e7969a7be964465152c8698958e429cfeea (patch)
tree71c88741a42ad458024b99e17f7a4c167c74acee
parent3cedbdcc71ebefc12bd20ec84f74251fe99ee7d0 (diff)
downloademacs-c5214e7969a7be964465152c8698958e429cfeea.tar.gz
emacs-c5214e7969a7be964465152c8698958e429cfeea.zip
Be more verbose when changing frame mode in ediff
* lisp/vc/ediff-util.el (ediff-toggle-multiframe): Say what mode we toggled to (bug#21853). Copyright-paperwork-exempt: yes
-rw-r--r--lisp/vc/ediff-util.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 5419d477810..eb5c2490a7e 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1293,7 +1293,8 @@ which see."
1293 1293
1294 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe) 1294 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
1295 (setq ediff-multiframe nil) 1295 (setq ediff-multiframe nil)
1296 (setq window-setup-func 'ediff-setup-windows-plain)) 1296 (setq window-setup-func 'ediff-setup-windows-plain)
1297 (message "ediff is now in 'plain' mode"))
1297 ((eq ediff-window-setup-function 'ediff-setup-windows-plain) 1298 ((eq ediff-window-setup-function 'ediff-setup-windows-plain)
1298 (if (ediff-in-control-buffer-p) 1299 (if (ediff-in-control-buffer-p)
1299 (ediff-kill-bottom-toolbar)) 1300 (ediff-kill-bottom-toolbar))
@@ -1301,14 +1302,15 @@ which see."
1301 (window-live-p ediff-control-window)) 1302 (window-live-p ediff-control-window))
1302 (set-window-dedicated-p ediff-control-window nil)) 1303 (set-window-dedicated-p ediff-control-window nil))
1303 (setq ediff-multiframe t) 1304 (setq ediff-multiframe t)
1304 (setq window-setup-func 'ediff-setup-windows-multiframe)) 1305 (setq window-setup-func 'ediff-setup-windows-multiframe)
1306 (message "ediff is now in 'multiframe' mode"))
1305 (t 1307 (t
1306 (if (and (ediff-buffer-live-p ediff-control-buffer) 1308 (if (and (ediff-buffer-live-p ediff-control-buffer)
1307 (window-live-p ediff-control-window)) 1309 (window-live-p ediff-control-window))
1308 (set-window-dedicated-p ediff-control-window nil)) 1310 (set-window-dedicated-p ediff-control-window nil))
1309 (setq ediff-multiframe t) 1311 (setq ediff-multiframe t)
1310 (setq window-setup-func 'ediff-setup-windows-multiframe)) 1312 (setq window-setup-func 'ediff-setup-windows-multiframe))
1311 ) 1313 (message "ediff is now in 'multiframe' mode"))
1312 1314
1313 ;; change default 1315 ;; change default
1314 (setq-default ediff-window-setup-function window-setup-func) 1316 (setq-default ediff-window-setup-function window-setup-func)