[Emacs-diffs] /srv/bzr/emacs/trunk r111766: * vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus'

[Juri Linkov]

------------------------------------------------------------
revno: 111766
fixes bug: http://debbugs.gnu.org/12218
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-02-13 10:41:56 +0200
message:
  * vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus'
  to select `ediff-control-frame' and set input focus correctly on Xfce.
modified:
  lisp/ChangeLog
  lisp/vc/ediff-util.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-13 08:28:47 +0000
+++ b/lisp/ChangeLog    2013-02-13 08:41:56 +0000
@@ -1,5 +1,11 @@
 2013-02-13  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * image-mode.el (image-mode-map):
        * doc-view.el (doc-view-mode-map):
        * vc/ediff-util.el (ediff-setup-keymap):

=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el     2013-02-13 08:28:47 +0000
+++ b/lisp/vc/ediff-util.el     2013-02-13 08:41:56 +0000
@@ -787,7 +787,12 @@
           (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)