]> code.delx.au - gnu-emacs/commitdiff
Be more verbose when changing frame mode in ediff
authorTino Calancha <f92capac@gmail.com>
Tue, 23 Feb 2016 04:55:08 +0000 (15:55 +1100)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 23 Feb 2016 04:55:08 +0000 (15:55 +1100)
* lisp/vc/ediff-util.el (ediff-toggle-multiframe): Say what
mode we toggled to (bug#21853).

Copyright-paperwork-exempt: yes

lisp/vc/ediff-util.el

index 5419d4778107114f7f23b810d5e85a0268753e46..eb5c2490a7e87f3ecabd4086fdd29bf2d46b4716 100644 (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)