diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b39762a9fe0..e7b5c487834 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,20 +1,22 @@
+2001-07-02  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* info.el (Info-clone-buffer-hook): Really unconditionally copy marker.
+
 2001-07-02  Gerd Moellmann  <gerd@gnu.org>
 
-	* emacs-lisp/cl-macs.el (cl-do-arglist): Revert change of
-	2000-10-15.
+	* emacs-lisp/cl-macs.el (cl-do-arglist): Revert change of 2000-10-15.
 
 2001-07-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* allout.el: Fix the header line, so that finder.el recognizes it.
 	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
 
-	* emacs-lisp/lisp-mnt.el (lm-header-prefix): Doc fix.  From Pavel
-        Jan,Bm(Bk <Pavel@Janik.cz>.
+	* emacs-lisp/lisp-mnt.el (lm-header-prefix): Doc fix.
+	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
 
 2001-06-29  Eli Zaretskii  <eliz@is.elta.co.il>
 
-	* term/w32-win.el (x-colors): Add colors from the recent rgb.txt
-	file.
+	* term/w32-win.el (x-colors): Add colors from the recent rgb.txt file.
 
 	* ps-bdf.el (bdf-directory-list): Use the value relative to
 	installation-directory for MS-Windows as well.
@@ -36,7 +38,7 @@
 	(rmail-msg-restore-non-pruned-header): Likewise.
 	If point was in the old pruned header, put it at the top.
 	(rmail-msg-prune-header): If point was at the top, keep it there.
-	
+
 	* mail/rmail.el (rmail-narrow-to-non-pruned-header): New function.
 	(rmail-retry-failure): Use rmail-narrow-to-non-pruned-header.
 
diff --git a/lisp/info.el b/lisp/info.el
index aaf7b1811e7..301ad5ae606 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -664,7 +664,7 @@ a case-insensitive match is tried."
           ;; Search file for a suitable node.
 	  (let ((guesspos (point-min))
 		(regexp (concat "\\(Node:\\|Ref:\\) *\\("
-				(if (stringp nodename) 
+				(if (stringp nodename)
 				    (regexp-quote nodename)
 				  "")
 				"\\) *[,\t\n\177]"))
@@ -2309,10 +2309,11 @@ Advanced commands:
 (defun Info-clone-buffer-hook ()
   (when (bufferp Info-tag-table-buffer)
     (setq Info-tag-table-buffer
-	  (with-current-buffer Info-tag-table-buffer (clone-buffer)))
-    (let ((m Info-tag-table-marker))
+	  (with-current-buffer Info-tag-table-buffer (clone-buffer))))
+  (let ((m Info-tag-table-marker))
+    (when (markerp m)
       (setq Info-tag-table-marker
-	    (if (and (markerp m) (marker-position m))
+	    (if (and (marker-position m) (bufferp Info-tag-table-buffer))
 		(with-current-buffer Info-tag-table-buffer
 		  (copy-marker (marker-position m)))
 	      (make-marker))))))