# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 889175360 0
# Node ID 0c95fb73e09044a31f69e88ba32c4be7e0471ae6
# Parent  926d7b2358dc4f3b48f37837a1611be9274ea7f8
1998-03-06  Carsten Dominik  <cd@delysid.gnu.org>

* (reftex-select-item): A set-buffer in the unwind-protect form makes
sure we deinstall in the correct hooks.

diff -r 926d7b2358dc -r 0c95fb73e090 lisp/textmodes/reftex.el
--- a/lisp/textmodes/reftex.el	Fri Mar 06 05:51:51 1998 +0000
+++ b/lisp/textmodes/reftex.el	Fri Mar 06 09:09:20 1998 +0000
@@ -1184,7 +1184,7 @@
 ;;; Define the formal stuff for a minor mode named RefTeX.
 ;;;
 
-;; This file corresponds to RefTeX version 3.18.0.2
+;; This file corresponds to RefTeX version 3.19.0.1
 
 (defvar reftex-mode nil
   "Determines if RefTeX minor mode is active.")
@@ -4651,7 +4651,7 @@
 ;; When MATCH-EVERYWHERE is t, searches will also match in non-selectable
 ;; places.
 
-  (let* (ev data last-data callback-fwd)
+  (let* (ev data last-data callback-fwd (selection-buffer (current-buffer)))
 
     (setq ev
           (catch 'myexit
@@ -4689,10 +4689,13 @@
 	    (run-hooks 'post-command-hook)  ;; because XEmacs does not do it
 	    (recursive-edit))
 
-	(use-local-map nil)
-	(remove-hook 'pre-command-hook 'reftex-select-pre-command-hook t)
-	(remove-hook 'post-command-hook 'reftex-select-post-command-hook t)
-	(set-marker reftex-recursive-edit-marker nil)))))
+	(set-marker reftex-recursive-edit-marker nil)
+	(save-excursion
+	  (set-buffer selection-buffer)
+	  (use-local-map nil)
+	  (remove-hook 'pre-command-hook 'reftex-select-pre-command-hook t)
+	  (remove-hook 'post-command-hook 
+		       'reftex-select-post-command-hook t))))))
 
     (set (make-local-variable 'reftex-last-line)
 	 (+ (count-lines (point-min) (point)) (if (bolp) 1 0)))