[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-toc.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/01/08 05:05:55

Index: reftex-toc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/reftex-toc.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- reftex-toc.el       8 Dec 2007 01:02:19 -0000       1.40
+++ reftex-toc.el       8 Jan 2008 05:05:55 -0000       1.41
@@ -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 <address@hidden>
 ;; Maintainer: address@hidden
@@ -995,10 +995,11 @@
       (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