* 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77432c00670384085fce83e1255bdfe91940846d..172af2f4efdf09413b30c963e60ec4c9d377991d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 3fcfcff9a7462802539bc99baf946899def9e0a4..fd53aabd33c737c2486f518dfc43cece7923b00c 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -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)