* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
@ 2012-08-17 10:22 Jambunathan K
2012-10-05 16:14 ` martin rudalics
0 siblings, 1 reply; 20+ messages in thread
From: Jambunathan K @ 2012-08-17 10:22 UTC (permalink / raw)
To: 12218
My Bzr checkout is at
kjambunathan@debian-6:~/src/emacs/trunk/lisp$ bzr version-info
revision-id: rgm@gnu.org-20120817072823-0zjgqf10g1d0vcf1
date: 2012-08-17 00:28:23 -0700
build-date: 2012-08-17 15:46:53 +0530
revno: 109655
branch-nick: trunk
1. C-x C-f <some modified file>
2. M-x vc-ediff
3. Press `n' in the control panel
4. Note that the one of the src buffer - buffer B specifically - becomes
receives focus (or whatever you call it)
5. Pressing another `n' and it modifies the src buffer.
I would expect that focus never leave the ediff control panel.
Seems like a recent regression to me.
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-08-17 10:22 bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel Jambunathan K
@ 2012-10-05 16:14 ` martin rudalics
2012-10-05 17:12 ` Jambunathan K
0 siblings, 1 reply; 20+ messages in thread
From: martin rudalics @ 2012-10-05 16:14 UTC (permalink / raw)
To: Jambunathan K; +Cc: 12218
> 1. C-x C-f <some modified file>
> 2. M-x vc-ediff
> 3. Press `n' in the control panel
> 4. Note that the one of the src buffer - buffer B specifically - becomes
> receives focus (or whatever you call it)
> 5. Pressing another `n' and it modifies the src buffer.
>
> I would expect that focus never leave the ediff control panel.
>
> Seems like a recent regression to me.
I can't reproduce that here. But maybe you should try customizing the
variable `ediff-grab-mouse' to t.
martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-05 16:14 ` martin rudalics
@ 2012-10-05 17:12 ` Jambunathan K
2012-10-05 18:07 ` martin rudalics
0 siblings, 1 reply; 20+ messages in thread
From: Jambunathan K @ 2012-10-05 17:12 UTC (permalink / raw)
To: martin rudalics; +Cc: 12218
[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]
martin rudalics <rudalics@gmx.at> writes:
>> 1. C-x C-f <some modified file>
>> 2. M-x vc-ediff
>> 3. Press `n' in the control panel
>> 4. Note that the one of the src buffer - buffer B specifically - becomes
>> receives focus (or whatever you call it)
>> 5. Pressing another `n' and it modifies the src buffer.
>>
>> I would expect that focus never leave the ediff control panel.
>>
>> Seems like a recent regression to me.
>
> I can't reproduce that here. But maybe you should try customizing the
> variable `ediff-grab-mouse' to t.
I am debian squeeze running Emacs from trunk (bzr version is visible in
the attached screenshot). Emacs is launched like this:
~/src/emacs/trunk/src/emacs --debug-init -Q
`ediff-grab-mouse' is at it's default value of t.
I am attaching a screenshot of my desktop.
I don't know whether the diff file has any bearing on the behaviour.
The register.el on display is the one obtained by applying the
bug12389.diff.
This bug is bit of an annoyance. I am happy you are lookng in to it.
[-- Attachment #2: bug12218.png --]
[-- Type: image/png, Size: 75606 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: bug12389.diff --]
[-- Type: text/x-diff, Size: 1224 bytes --]
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2012-10-03 08:50:49 +0000
+++ lisp/ChangeLog 2012-10-03 14:26:48 +0000
@@ -1,3 +1,9 @@
+2012-10-03 Jambunathan K <kjambunathan@gmail.com>
+
+ * register.el (append-to-register, prepend-to-register):
+ Deactivate mark. This accords with current behaviour of
+ `copy-to-register'. See (Bug#12389).
+
2012-10-03 Martin Rudalics <rudalics@gmx.at>
* menu-bar.el (kill-this-buffer): Don't do anything when
=== modified file 'lisp/register.el'
--- lisp/register.el 2012-09-09 08:10:56 +0000
+++ lisp/register.el 2012-10-03 13:21:46 +0000
@@ -382,6 +382,7 @@
register (cond ((not reg) text)
((stringp reg) (concat reg separator text))
(t (error "Register does not contain text")))))
+ (setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))
((called-interactively-p 'interactive)
@@ -400,6 +401,7 @@
register (cond ((not reg) text)
((stringp reg) (concat text separator reg))
(t (error "Register does not contain text")))))
+ (setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))
((called-interactively-p 'interactive)
[-- Attachment #4: Type: text/plain, Size: 10 bytes --]
> martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-05 17:12 ` Jambunathan K
@ 2012-10-05 18:07 ` martin rudalics
2012-10-05 18:46 ` Jambunathan K
0 siblings, 1 reply; 20+ messages in thread
From: martin rudalics @ 2012-10-05 18:07 UTC (permalink / raw)
To: Jambunathan K; +Cc: 12218
> I am debian squeeze running Emacs from trunk (bzr version is visible in
> the attached screenshot). Emacs is launched like this:
>
> ~/src/emacs/trunk/src/emacs --debug-init -Q
>
> `ediff-grab-mouse' is at it's default value of t.
And what happens if you set it to nil (that's what I use for whatever
reason). IIRC ediff's mouse grabbing code is very convoluted and partly
dead.
> I am attaching a screenshot of my desktop.
>
> I don't know whether the diff file has any bearing on the behaviour.
> The register.el on display is the one obtained by applying the
> bug12389.diff.
>
> This bug is bit of an annoyance. I am happy you are lookng in to it.
I'm afraid I can't be of much help here. I don't put the control panel
in an extra frame; I use `ediff-setup-windows-plain'.
martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-05 18:07 ` martin rudalics
@ 2012-10-05 18:46 ` Jambunathan K
2012-10-05 19:07 ` martin rudalics
0 siblings, 1 reply; 20+ messages in thread
From: Jambunathan K @ 2012-10-05 18:46 UTC (permalink / raw)
To: martin rudalics; +Cc: 12218
martin rudalics <rudalics@gmx.at> writes:
>> I am debian squeeze running Emacs from trunk (bzr version is visible in
>> the attached screenshot). Emacs is launched like this:
>>
>> ~/src/emacs/trunk/src/emacs --debug-init -Q
>>
>> `ediff-grab-mouse' is at it's default value of t.
>
> And what happens if you set it to nil (that's what I use for whatever
> reason). IIRC ediff's mouse grabbing code is very convoluted and partly
> dead.
If I set `ediff-grab-mouse' to nil, I continue get the buggy behaviour.
>> I am attaching a screenshot of my desktop.
>>
>> I don't know whether the diff file has any bearing on the behaviour.
>> The register.el on display is the one obtained by applying the
>> bug12389.diff.
>>
>> This bug is bit of an annoyance. I am happy you are lookng in to it.
>
> I'm afraid I can't be of much help here. I don't put the control panel
> in an extra frame; I use `ediff-setup-windows-plain'.
I don't know how to use `ediff-setup-windows-plain'. Can you give more
information?
I expect the right behaviour with `emacs -Q'. It doesn't matter what
configuration you have in your local area.
Btw, I am concerned that you might not have tried my recipe in first
place. May be you should...
> martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-05 18:46 ` Jambunathan K
@ 2012-10-05 19:07 ` martin rudalics
2012-10-05 19:42 ` Jambunathan K
0 siblings, 1 reply; 20+ messages in thread
From: martin rudalics @ 2012-10-05 19:07 UTC (permalink / raw)
To: Jambunathan K; +Cc: 12218
> I don't know how to use `ediff-setup-windows-plain'. Can you give more
> information?
I have the following ediff-related settings in my .emacs:
(custom-set-variables
'(ediff-custom-diff-options "-c --binary")
'(ediff-grab-mouse nil)
'(ediff-merge-split-window-function (quote split-window-horizontally))
'(ediff-patch-options "-f --binary")
'(ediff-split-window-function (quote split-window-horizontally))
'(ediff-trees-file-ignore-regexp "\\`\\(\\.?#.*\\|.*,v\\|.*~\\|CVS\\|_darcs\\|.*\\.elc\\)\\'")
'(ediff-window-setup-function (quote ediff-setup-windows-plain)))
> I expect the right behaviour with `emacs -Q'. It doesn't matter what
> configuration you have in your local area.
It sometimes does. With multiple frames your window manager settings
might kick in.
> Btw, I am concerned that you might not have tried my recipe in first
> place. May be you should...
Be assured I did. With emacs -Q your scenario works without problems
here. But I remember that I had to set `ediff-grab-mouse' to nil with
my one-frame setup precisely because of the problem you described. I
suppose it's related to my `mouse-autoselect-window' settings but didn't
explore this issue any further.
martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-05 19:07 ` martin rudalics
@ 2012-10-05 19:42 ` Jambunathan K
2012-10-06 8:14 ` martin rudalics
0 siblings, 1 reply; 20+ messages in thread
From: Jambunathan K @ 2012-10-05 19:42 UTC (permalink / raw)
To: martin rudalics; +Cc: 12218
martin rudalics <rudalics@gmx.at> writes:
>> I don't know how to use `ediff-setup-windows-plain'. Can you give more
>> information?
>
> I have the following ediff-related settings in my .emacs:
>
> (custom-set-variables
> '(ediff-custom-diff-options "-c --binary")
> '(ediff-grab-mouse nil)
> '(ediff-merge-split-window-function (quote split-window-horizontally))
> '(ediff-patch-options "-f --binary")
> '(ediff-split-window-function (quote split-window-horizontally))
> '(ediff-trees-file-ignore-regexp
> "\\`\\(\\.?#.*\\|.*,v\\|.*~\\|CVS\\|_darcs\\|.*\\.elc\\)\\'")
> '(ediff-window-setup-function (quote ediff-setup-windows-plain)))
If my init file contains just the last line as below:
(custom-set-variables
'(ediff-window-setup-function (quote ediff-setup-windows-plain)))
then I get the expected behaviour.
>> I expect the right behaviour with `emacs -Q'. It doesn't matter what
>> configuration you have in your local area.
>
> It sometimes does. With multiple frames your window manager settings
> might kick in.
0. IMPORTANT: REMOVE all customizations and start with emacs -Q
1. C-x C-f lisp/register.el
2. C-x C-w register-1.el
3. Make some changes here and there in register-1.el
4. M-x ediff-files RET register.el RET register-1.el
5. Enusre that the control panel pops-up in a separate frame.
6. Keep pressing `n'
7. The focus NEVER LEAVES the control panel on my machine.
Summary: M-x vc-ediff RET is buggy while M-x ediff-files RET is NOT
buggy.
Given the above experiment/result do you still think that window manager
is at play here. My "gut" feeling says that vc-ediff is "forgetting"
some stuff. (Remember vc-ediff is fairly a new arrival)
>> Btw, I am concerned that you might not have tried my recipe in first
>> place. May be you should...
>
> Be assured I did. With emacs -Q your scenario works without problems
> here. But I remember that I had to set `ediff-grab-mouse' to nil with
> my one-frame setup precisely because of the problem you described. I
> suppose it's related to my `mouse-autoselect-window' settings but didn't
> explore this issue any further.
If multiple-frames is problematic (on some machines) shouldn't the
default be modified to be just plain.
But, in that case, people like me, who are used to seeing the control
panel float to top-right, will complain that the defaults are changed
:-).
> martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-05 19:42 ` Jambunathan K
@ 2012-10-06 8:14 ` martin rudalics
2012-10-06 17:40 ` Juri Linkov
0 siblings, 1 reply; 20+ messages in thread
From: martin rudalics @ 2012-10-06 8:14 UTC (permalink / raw)
To: Jambunathan K; +Cc: 12218
> 0. IMPORTANT: REMOVE all customizations and start with emacs -Q
> 1. C-x C-f lisp/register.el
> 2. C-x C-w register-1.el
> 3. Make some changes here and there in register-1.el
> 4. M-x ediff-files RET register.el RET register-1.el
> 5. Enusre that the control panel pops-up in a separate frame.
> 6. Keep pressing `n'
> 7. The focus NEVER LEAVES the control panel on my machine.
>
> Summary: M-x vc-ediff RET is buggy while M-x ediff-files RET is NOT
> buggy.
`vc-ediff' ends up calling `ediff-setup' just like `ediff-files'. So
we'd have to find something that happens before these two calls that
affects the behavior of `ediff-next-difference'. Maybe in an assignment
to one of ediff's hooks. If you trace the calls to `ediff-setup' can
you see any differences?
> Given the above experiment/result do you still think that window manager
> is at play here. My "gut" feeling says that vc-ediff is "forgetting"
> some stuff. (Remember vc-ediff is fairly a new arrival)
No. What I meant was that the window manager might be at play when
comparing the behavior on your machine and mine or when comparing a
multiframe with a one-frame setup.
> If multiple-frames is problematic (on some machines) shouldn't the
> default be modified to be just plain.
If more people complained, this would probably happen. But IIUC ediff
is not very popular and largely unmaintained.
> But, in that case, people like me, who are used to seeing the control
> panel float to top-right, will complain that the defaults are changed
> :-).
Likely. I've been told on this list that my one-frame setup for ediff
is non-standard and any problems it causes "won't be a problem for most
users" ;-)
martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-06 8:14 ` martin rudalics
@ 2012-10-06 17:40 ` Juri Linkov
2012-10-08 6:56 ` martin rudalics
0 siblings, 1 reply; 20+ messages in thread
From: Juri Linkov @ 2012-10-06 17:40 UTC (permalink / raw)
To: martin rudalics; +Cc: 12218, Jambunathan K
>> If multiple-frames is problematic (on some machines) shouldn't the
>> default be modified to be just plain.
>
> If more people complained, this would probably happen. But IIUC ediff
> is not very popular and largely unmaintained.
>
>> But, in that case, people like me, who are used to seeing the control
>> panel float to top-right, will complain that the defaults are changed
>> :-).
>
> Likely. I've been told on this list that my one-frame setup for ediff
> is non-standard and any problems it causes "won't be a problem for most
> users" ;-)
If you are collecting statistics on ediff usage on a one-frame setup,
here is what I have in ~/.emacs:
(custom-set-variables
'(ediff-split-window-function (quote split-window-horizontally))
'(ediff-window-setup-function (quote ediff-setup-windows-plain))
I guess people are not complaining about bad defaults because
they have customized them already.
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-06 17:40 ` Juri Linkov
@ 2012-10-08 6:56 ` martin rudalics
2012-10-08 11:03 ` Juri Linkov
0 siblings, 1 reply; 20+ messages in thread
From: martin rudalics @ 2012-10-08 6:56 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12218, Jambunathan K
> I guess people are not complaining about bad defaults because
> they have customized them already.
While you're here - can you reproduce the OP's behavior?
martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-08 6:56 ` martin rudalics
@ 2012-10-08 11:03 ` Juri Linkov
2013-02-10 2:52 ` Glenn Morris
0 siblings, 1 reply; 20+ messages in thread
From: Juri Linkov @ 2012-10-08 11:03 UTC (permalink / raw)
To: martin rudalics; +Cc: 12218, Jambunathan K
> While you're here - can you reproduce the OP's behavior?
It seems this bug depends on the desktop environment (window manager).
I can't reproduce it on Gnome 2 (Metacity), but the screenshot shows
that OP uses Xfce (Xfwm).
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2012-10-08 11:03 ` Juri Linkov
@ 2013-02-10 2:52 ` Glenn Morris
2013-02-10 10:46 ` Juri Linkov
0 siblings, 1 reply; 20+ messages in thread
From: Glenn Morris @ 2013-02-10 2:52 UTC (permalink / raw)
To: Juri Linkov; +Cc: Jambunathan K, 12218
Juri Linkov wrote:
> I can't reproduce it on Gnome 2 (Metacity), but the screenshot shows
> that OP uses Xfce (Xfwm).
Issues happens for me with XFCE and M-x ediff all the way back to at
least Emacs 22.3.
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-10 2:52 ` Glenn Morris
@ 2013-02-10 10:46 ` Juri Linkov
2013-02-10 17:32 ` martin rudalics
0 siblings, 1 reply; 20+ messages in thread
From: Juri Linkov @ 2013-02-10 10:46 UTC (permalink / raw)
To: Glenn Morris; +Cc: 12218, Jambunathan K
>> I can't reproduce it on Gnome 2 (Metacity), but the screenshot shows
>> that OP uses Xfce (Xfwm).
>
> Issues happens for me with XFCE and M-x ediff all the way back to at
> least Emacs 22.3.
As I see Ediff selects the frame using `raise-frame' and
`set-mouse-position' instead of `frame-focus' as would be
more natural to do. Maybe this is the cause of this problem.
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-10 10:46 ` Juri Linkov
@ 2013-02-10 17:32 ` martin rudalics
2013-02-11 9:27 ` Juri Linkov
0 siblings, 1 reply; 20+ messages in thread
From: martin rudalics @ 2013-02-10 17:32 UTC (permalink / raw)
To: Juri Linkov; +Cc: Jambunathan K, 12218
> As I see Ediff selects the frame using `raise-frame' and
> `set-mouse-position' instead of `frame-focus' as would be
> more natural to do. Maybe this is the cause of this problem.
Do you mean it should redirect frame focus?
martin
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-10 17:32 ` martin rudalics
@ 2013-02-11 9:27 ` Juri Linkov
2013-02-11 9:43 ` Jambunathan K
0 siblings, 1 reply; 20+ messages in thread
From: Juri Linkov @ 2013-02-11 9:27 UTC (permalink / raw)
To: martin rudalics; +Cc: Jambunathan K, 12218
> Do you mean it should redirect frame focus?
Maybe `redirect-frame-focus' is what is needed.
But unfortunately I can't reproduce this bug reliably
to try various solutions.
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-11 9:27 ` Juri Linkov
@ 2013-02-11 9:43 ` Jambunathan K
2013-02-12 17:47 ` Juri Linkov
0 siblings, 1 reply; 20+ messages in thread
From: Jambunathan K @ 2013-02-11 9:43 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12218
Juri Linkov <juri@jurta.org> writes:
>> Do you mean it should redirect frame focus?
>
> Maybe `redirect-frame-focus' is what is needed.
> But unfortunately I can't reproduce this bug reliably
> to try various solutions.
If you circulate a diff, I can try it out, as many times as you want.
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-11 9:43 ` Jambunathan K
@ 2013-02-12 17:47 ` Juri Linkov
2013-02-13 5:34 ` Jambunathan K
0 siblings, 1 reply; 20+ messages in thread
From: Juri Linkov @ 2013-02-12 17:47 UTC (permalink / raw)
To: Jambunathan K; +Cc: 12218
>> But unfortunately I can't reproduce this bug reliably
>> to try various solutions.
>
> If you circulate a diff, I can try it out, as many times as you want.
Please try this patch:
=== modified file 'lisp/vc/ediff-util.el'
--- lisp/vc/ediff-util.el 2013-01-03 00:36:36 +0000
+++ lisp/vc/ediff-util.el 2013-02-12 17:47:25 +0000
@@ -786,7 +786,11 @@ (defun ediff-recenter (&optional no-rehi
(frame-live-p ediff-control-frame)
(not ediff-use-long-help-message)
(not (ediff-frame-iconified-p ediff-control-frame)))
- (raise-frame ediff-control-frame))
+ (if (fboundp 'select-frame-set-input-focus)
+ (select-frame-set-input-focus ediff-control-frame)
+ (raise-frame ediff-control-frame)
+ (select-frame ediff-control-frame)
+ (focus-frame ediff-control-frame)))
;; Redisplay whatever buffers are showing, if there is a selected difference
(let ((control-frame ediff-control-frame)
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-12 17:47 ` Juri Linkov
@ 2013-02-13 5:34 ` Jambunathan K
2013-02-13 5:39 ` Jambunathan K
0 siblings, 1 reply; 20+ messages in thread
From: Jambunathan K @ 2013-02-13 5:34 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12218
I recommend that this patch be applied. Works for me on my XFCE sytem.
Juri Linkov <juri@jurta.org> writes:
>>> But unfortunately I can't reproduce this bug reliably
>>> to try various solutions.
>>
>> If you circulate a diff, I can try it out, as many times as you want.
>
> Please try this patch:
>
> === modified file 'lisp/vc/ediff-util.el'
> --- lisp/vc/ediff-util.el 2013-01-03 00:36:36 +0000
> +++ lisp/vc/ediff-util.el 2013-02-12 17:47:25 +0000
> @@ -786,7 +786,11 @@ (defun ediff-recenter (&optional no-rehi
> (frame-live-p ediff-control-frame)
> (not ediff-use-long-help-message)
> (not (ediff-frame-iconified-p ediff-control-frame)))
> - (raise-frame ediff-control-frame))
> + (if (fboundp 'select-frame-set-input-focus)
> + (select-frame-set-input-focus ediff-control-frame)
> + (raise-frame ediff-control-frame)
> + (select-frame ediff-control-frame)
> + (focus-frame ediff-control-frame)))
>
> ;; Redisplay whatever buffers are showing, if there is a selected difference
> (let ((control-frame ediff-control-frame)
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-13 5:34 ` Jambunathan K
@ 2013-02-13 5:39 ` Jambunathan K
2013-02-13 8:44 ` Juri Linkov
0 siblings, 1 reply; 20+ messages in thread
From: Jambunathan K @ 2013-02-13 5:39 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12218
Jambunathan K <kjambunathan@gmail.com> writes:
> I recommend that this patch be applied. Works for me on my XFCE sytem.
Also verified with "emacs -Q".
>
>
> Juri Linkov <juri@jurta.org> writes:
>
>>>> But unfortunately I can't reproduce this bug reliably
>>>> to try various solutions.
>>>
>>> If you circulate a diff, I can try it out, as many times as you want.
>>
>> Please try this patch:
>>
>> === modified file 'lisp/vc/ediff-util.el'
>> --- lisp/vc/ediff-util.el 2013-01-03 00:36:36 +0000
>> +++ lisp/vc/ediff-util.el 2013-02-12 17:47:25 +0000
>> @@ -786,7 +786,11 @@ (defun ediff-recenter (&optional no-rehi
>> (frame-live-p ediff-control-frame)
>> (not ediff-use-long-help-message)
>> (not (ediff-frame-iconified-p ediff-control-frame)))
>> - (raise-frame ediff-control-frame))
>> + (if (fboundp 'select-frame-set-input-focus)
>> + (select-frame-set-input-focus ediff-control-frame)
>> + (raise-frame ediff-control-frame)
>> + (select-frame ediff-control-frame)
>> + (focus-frame ediff-control-frame)))
>>
>> ;; Redisplay whatever buffers are showing, if there is a selected difference
>> (let ((control-frame ediff-control-frame)
^ permalink raw reply [flat|nested] 20+ messages in thread
* bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel
2013-02-13 5:39 ` Jambunathan K
@ 2013-02-13 8:44 ` Juri Linkov
0 siblings, 0 replies; 20+ messages in thread
From: Juri Linkov @ 2013-02-13 8:44 UTC (permalink / raw)
To: Jambunathan K; +Cc: 12218-done
Version: 24.3.50
>> I recommend that this patch be applied. Works for me on my XFCE sytem.
>
> Also verified with "emacs -Q".
Thanks for verifying. This is now installed in trunk, and the bug is closed.
PS: Note that (fboundp 'select-frame-set-input-focus) is added
for the case when Ediff is used with some other Emacs versions.
Its else-branch is like in `gnus-select-frame-set-input-focus'
in gnus-util.el.
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2013-02-13 8:44 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-17 10:22 bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel Jambunathan K
2012-10-05 16:14 ` martin rudalics
2012-10-05 17:12 ` Jambunathan K
2012-10-05 18:07 ` martin rudalics
2012-10-05 18:46 ` Jambunathan K
2012-10-05 19:07 ` martin rudalics
2012-10-05 19:42 ` Jambunathan K
2012-10-06 8:14 ` martin rudalics
2012-10-06 17:40 ` Juri Linkov
2012-10-08 6:56 ` martin rudalics
2012-10-08 11:03 ` Juri Linkov
2013-02-10 2:52 ` Glenn Morris
2013-02-10 10:46 ` Juri Linkov
2013-02-10 17:32 ` martin rudalics
2013-02-11 9:27 ` Juri Linkov
2013-02-11 9:43 ` Jambunathan K
2013-02-12 17:47 ` Juri Linkov
2013-02-13 5:34 ` Jambunathan K
2013-02-13 5:39 ` Jambunathan K
2013-02-13 8:44 ` Juri Linkov
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).