summaryrefslogtreecommitdiff
path: root/lisp/textmodes/reftex-toc.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-01-08 05:06:48 +0000
committerGlenn Morris <rgm@gnu.org>2008-01-08 05:06:48 +0000
commitdf17e41e8d19a47ae51ae3af786c2c959740a325 (patch)
tree43a2a4257413da64a3c61767c6e55116a48ca03c /lisp/textmodes/reftex-toc.el
parent6916ec0810e80f26dace4e688f136393decbfdbd (diff)
downloademacs-df17e41e8d19a47ae51ae3af786c2c959740a325.tar.gz
Ralf Angeli <angeli at caeruleus.net>
(reftex-make-separate-toc-frame): Simplify selection of frame focusing function.
Diffstat (limited to 'lisp/textmodes/reftex-toc.el')
-rw-r--r--lisp/textmodes/reftex-toc.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index e3d8b3e4793..0e501fdf23e 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -1,6 +1,6 @@
;;; reftex-toc.el --- RefTeX's table of contents mode
;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
-;; 2006, 2007 Free Software Foundation, Inc.
+;; 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@science.uva.nl>
;; Maintainer: auctex-devel@gnu.org
@@ -995,10 +995,11 @@ always show the current section in connection with the option
(select-frame current-toc-frame)
(switch-to-buffer "*toc*")
(select-frame current-frame)
- (if (fboundp 'x-focus-frame) (x-focus-frame current-frame)
- ;; focus-frame has done nothing in Emacs since at least v21.
- (if (featurep 'xemacs)
- (if (fboundp 'focus-frame) (focus-frame current-frame))))
+ (cond ((fboundp 'x-focus-frame)
+ (x-focus-frame current-frame))
+ ((and (featurep 'xemacs) ; `focus-frame' is a nop in Emacs.
+ (fboundp 'focus-frame))
+ (focus-frame current-frame)))
(select-window current-window)
(when (eq reftex-auto-recenter-toc 'frame)
(unless reftex-toc-auto-recenter-timer