* bug#21853: Ediff 2.81.5 of July 4, 2013; Increase verbosity ofediff-toggle-multiframe
@ 2015-11-07 15:24 Tino Calancha
2016-02-23 4:55 ` Lars Ingebrigtsen
0 siblings, 1 reply; 2+ messages in thread
From: Tino Calancha @ 2015-11-07 15:24 UTC (permalink / raw)
To: kifer, 21853; +Cc: Tino Calancha
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
Congratulations! You may have unearthed a bug in Ediff!
Please make a concise and accurate summary of what happened
and mail it to the address above.
-----------------------------------------------------------
Increase verbosity of ediff-toggle-multiframe
* lisp/vc/ediff-util.el (ediff-toggle-multiframe):
Print out in the minibuffer the updated ediff frame mode.
Emacs : GNU Emacs 25.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.28)
of 2015-11-07
Package: Ediff 2.81.5 of July 4, 2013
[-- Attachment #2: Type: text/plain, Size: 1364 bytes --]
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 7ef4254..04b7625 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1293,7 +1293,8 @@ ediff-toggle-multiframe
(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 "Set ediff in plain mode"))
((eq ediff-window-setup-function 'ediff-setup-windows-plain)
(if (ediff-in-control-buffer-p)
(ediff-kill-bottom-toolbar))
@@ -1301,13 +1302,15 @@ ediff-toggle-multiframe
(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 "Set ediff 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))
+ (setq window-setup-func 'ediff-setup-windows-multiframe)
+ (message "Set ediff in multiframe mode"))
)
;; change default
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#21853: Ediff 2.81.5 of July 4, 2013; Increase verbosity ofediff-toggle-multiframe
2015-11-07 15:24 bug#21853: Ediff 2.81.5 of July 4, 2013; Increase verbosity ofediff-toggle-multiframe Tino Calancha
@ 2016-02-23 4:55 ` Lars Ingebrigtsen
0 siblings, 0 replies; 2+ messages in thread
From: Lars Ingebrigtsen @ 2016-02-23 4:55 UTC (permalink / raw)
To: Tino Calancha; +Cc: kifer, 21853
Tino Calancha <f92capac@gmail.com> writes:
> Increase verbosity of ediff-toggle-multiframe
>
> * lisp/vc/ediff-util.el (ediff-toggle-multiframe):
> Print out in the minibuffer the updated ediff frame mode.
Thanks; I applied your patch to the Emacs trunk (with some changes in
wording).
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-23 4:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-07 15:24 bug#21853: Ediff 2.81.5 of July 4, 2013; Increase verbosity ofediff-toggle-multiframe Tino Calancha
2016-02-23 4:55 ` Lars Ingebrigtsen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).