diff options
| author | Juri Linkov | 2013-02-13 10:41:56 +0200 |
|---|---|---|
| committer | Juri Linkov | 2013-02-13 10:41:56 +0200 |
| commit | ef79c6ed07f093d6f40f335734dba8acfe8a09df (patch) | |
| tree | 129c4c35d1e7dada35b3e22c422e20ebe0ad15b3 /lisp/vc | |
| parent | 9cec74cfd720b607fe9fb2929ce1dfeca53ac544 (diff) | |
| download | emacs-ef79c6ed07f093d6f40f335734dba8acfe8a09df.tar.gz emacs-ef79c6ed07f093d6f40f335734dba8acfe8a09df.zip | |
* 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
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff-util.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 3fcfcff9a74..fd53aabd33c 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el | |||
| @@ -787,7 +787,12 @@ Reestablish the default three-window display." | |||
| 787 | (frame-live-p ediff-control-frame) | 787 | (frame-live-p ediff-control-frame) |
| 788 | (not ediff-use-long-help-message) | 788 | (not ediff-use-long-help-message) |
| 789 | (not (ediff-frame-iconified-p ediff-control-frame))) | 789 | (not (ediff-frame-iconified-p ediff-control-frame))) |
| 790 | (raise-frame ediff-control-frame)) | 790 | (if (fboundp 'select-frame-set-input-focus) |
| 791 | (select-frame-set-input-focus ediff-control-frame) | ||
| 792 | (raise-frame ediff-control-frame) | ||
| 793 | (select-frame ediff-control-frame) | ||
| 794 | (if (fboundp 'focus-frame) | ||
| 795 | (focus-frame ediff-control-frame)))) | ||
| 791 | 796 | ||
| 792 | ;; Redisplay whatever buffers are showing, if there is a selected difference | 797 | ;; Redisplay whatever buffers are showing, if there is a selected difference |
| 793 | (let ((control-frame ediff-control-frame) | 798 | (let ((control-frame ediff-control-frame) |