Commit ef79c6ed authored by Juri Linkov's avatar Juri Linkov
Browse files

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

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

Fixes: debbugs:12218
parent 9cec74cf
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):
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment