*** etags.el.orig	Thu Aug 25 10:50:17 1994
--- etags.el	Tue Apr 14 21:48:48 1998
***************
*** 690,695 ****
--- 690,698 ----
    (setq find-tag-history (cons tagname find-tag-history))
    ;; Save the current buffer's value of `find-tag-hook' before selecting the
    ;; tags table buffer.
+   (if (not (eq '- next-p))
+       (setq tags-location-stack
+ 	    (cons (point-marker) tags-location-stack)))
    (let ((local-find-tag-hook find-tag-hook))
      (if (eq '- next-p)
  	;; Pop back to a previous location.
***************
*** 716,742 ****
        (prog1
  	  ;; Record the location so we can pop back to it later.
  	  (marker-buffer
! 	   (car
! 	    (setq tags-location-stack
! 		  (cons (let ((marker (make-marker)))
! 			  (save-excursion
! 			    (set-buffer
! 			     ;; find-tag-in-order does the real work.
! 			     (find-tag-in-order
! 			      (if next-p last-tag tagname)
! 			      (if regexp-p
! 				  find-tag-regexp-search-function
! 				find-tag-search-function)
! 			      (if regexp-p
! 				  find-tag-regexp-tag-order
! 				find-tag-tag-order)
! 			      (if regexp-p
! 				  find-tag-regexp-next-line-after-failure-p
! 				find-tag-next-line-after-failure-p)
! 			      (if regexp-p "matching" "containing")
! 			      (not next-p)))
! 			    (set-marker marker (point))))
! 			tags-location-stack))))
  	(run-hooks 'local-find-tag-hook)))))
  
  ;;;###autoload
--- 719,742 ----
        (prog1
  	  ;; Record the location so we can pop back to it later.
  	  (marker-buffer
! 	   (let ((marker (make-marker)))
! 	     (save-excursion
! 	       (set-buffer
! 		;; find-tag-in-order does the real work.
! 		(find-tag-in-order
! 		 (if next-p last-tag tagname)
! 		 (if regexp-p
! 		     find-tag-regexp-search-function
! 		   find-tag-search-function)
! 		 (if regexp-p
! 		     find-tag-regexp-tag-order
! 		   find-tag-tag-order)
! 		 (if regexp-p
! 		     find-tag-regexp-next-line-after-failure-p
! 		   find-tag-next-line-after-failure-p)
! 		 (if regexp-p "matching" "containing")
! 		 (not next-p)))
! 	       (set-marker marker (point)))))
  	(run-hooks 'local-find-tag-hook)))))
  
  ;;;###autoload