diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-01-08 05:06:48 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-01-08 05:06:48 +0000 |
| commit | df17e41e8d19a47ae51ae3af786c2c959740a325 (patch) | |
| tree | 43a2a4257413da64a3c61767c6e55116a48ca03c | |
| parent | 6916ec0810e80f26dace4e688f136393decbfdbd (diff) | |
| download | emacs-df17e41e8d19a47ae51ae3af786c2c959740a325.tar.gz emacs-df17e41e8d19a47ae51ae3af786c2c959740a325.tar.bz2 emacs-df17e41e8d19a47ae51ae3af786c2c959740a325.zip | |
Ralf Angeli <angeli at caeruleus.net>
(reftex-make-separate-toc-frame): Simplify selection of frame focusing
function.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/textmodes/reftex-toc.el | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ce308b563b..dc7dd5a4179 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-01-05 Ralf Angeli <angeli@caeruleus.net> + + * textmodes/reftex-toc.el (reftex-make-separate-toc-frame): + Simplify selection of frame focusing function. + 2008-01-08 Michael Olson <mwolson@gnu.org> * textmodes/remember.el (remember-region): Fix typo in docstring. 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 |