emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master c5214e7: Be more verbose when changing frame mode i


From: Lars Ingebrigtsen
Subject: [Emacs-diffs] master c5214e7: Be more verbose when changing frame mode in ediff
Date: Tue, 23 Feb 2016 04:56:26 +0000

branch: master
commit c5214e7969a7be964465152c8698958e429cfeea
Author: Tino Calancha <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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
---
 lisp/vc/ediff-util.el |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 5419d47..eb5c249 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]