diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-05-13 20:41:45 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-05-13 20:41:45 +0000 |
| commit | 4a9699d8c8c58515a8723e207d0cdef6054a46d0 (patch) | |
| tree | 715f3bc333b44ce039babc161bd0d1da5b2a30fe /lisp/textmodes/reftex-toc.el | |
| parent | 6df92b6f79af8204f6717f3e20db3d1500f4a607 (diff) | |
| download | emacs-4a9699d8c8c58515a8723e207d0cdef6054a46d0.tar.gz | |
(reftex-toc-visit-location):
Don't switch the current window if the new buffer is in another.
(reftex-toc): Don't assume that point-min == 1.
Diffstat (limited to 'lisp/textmodes/reftex-toc.el')
| -rw-r--r-- | lisp/textmodes/reftex-toc.el | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index b5c10a2998c..414760747e3 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -1,5 +1,5 @@ ;;; reftex-toc.el --- RefTeX's table of contents mode -;; Copyright (c) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (c) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Version: 4.18 @@ -177,9 +177,9 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help " (abbreviate-file-name reftex-last-toc-master))) (if (reftex-use-fonts) - (put-text-property 1 (point) 'face reftex-toc-header-face)) - (put-text-property 1 (point) 'intangible t) - (put-text-property 1 2 'xr-alist xr-alist) + (put-text-property (point-min) (point) 'face reftex-toc-header-face)) + (put-text-property (point-min) (point) 'intangible t) + (put-text-property (point-min) (1+ (point-min)) 'xr-alist xr-alist) (setq offset (reftex-insert-docstruct @@ -268,7 +268,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help (error t))))) (defun reftex-re-enlarge () - ;; Enlarge windiw to a remembered size + ;; Enlarge window to a remembered size. (if reftex-toc-split-windows-horizontally (enlarge-window-horizontally (max 0 (- (or reftex-last-window-width (window-width)) @@ -484,7 +484,7 @@ Useful for large TOC's." ;; If FINAL is t, stay there ;; If FINAL is 'hide, hide the *toc* window. ;; Otherwise, move cursor back into *toc* window. - ;; NO-REVISIT means don't visit files, just use live biffers. + ;; NO-REVISIT means don't visit files, just use live buffers. ;; This function is pretty clever about finding back a section heading, ;; even if the buffer is not live, or things like outline, x-symbol etc. ;; have been active. @@ -539,7 +539,11 @@ Useful for large TOC's." ((eq final 'hide) (reftex-unhighlight 0) (or (one-window-p) (delete-window)) - (switch-to-buffer show-buffer) + ;; If `show-window' is still live, show-buffer is already visible + ;; so let's not make it visible in yet-another-window. + (if (window-live-p show-window) + (select-window show-window) + (switch-to-buffer show-buffer)) (reftex-re-enlarge)) (t nil)))) |