martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus'

Browse Source 
to select `ediff-control-frame' and set input focus correctly on Xfce.

Fixes: debbugs:12218
This commit is contained in:
Juri Linkov
2013-02-13 10:41:56 +02:00
parent 9cec74cfd7
commit ef79c6ed07
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@@ -1,3 +1,9 @@
2013-02-13 Juri Linkov <juri@jurta.org>
* vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus'
to select `ediff-control-frame' and set input focus correctly on Xfce.
(Bug#12218)
2013-02-13 Juri Linkov <juri@jurta.org>
* image-mode.el (image-mode-map):

7
lisp/vc/ediff-util.el
View File

@@ -787,7 +787,12 @@ Reestablish the default three-window display."
(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)
(if (fboundp 'focus-frame)
(focus-frame ediff-control-frame))))
;; Redisplay whatever buffers are showing, if there is a selected difference
(let ((control-frame ediff-control-frame)