X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Finfo.el;h=6d4e22fb858654581663e5ab54962fe6571096fa;hb=9d42ddfbe6920bbf1e36c4d96b642c955f42e399;hp=bc245ff7ddbb73c213cbd688a4ca1e015f1ce17e;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git

diff --git a/lisp/info.el b/lisp/info.el
index bc245ff..6d4e22f 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1542,6 +1542,7 @@ annotation for any node of any file.  (See `a' and `x' commands.)"
       (let ((compl (Info-build-annotation-completions)))
 	(save-excursion
 	  (save-restriction
+	    (widen)
 	    (if (marker-buffer Info-tag-table-marker)
 		(progn
 		  (set-buffer (marker-buffer Info-tag-table-marker))
@@ -1551,7 +1552,6 @@ annotation for any node of any file.  (See `a' and `x' commands.)"
 			  (cons (list (buffer-substring (match-beginning 1)
 							(match-end 1)))
 				compl))))
-	      (widen)
 	      (goto-char (point-min))
 	      (while (search-forward "\n\^_" nil t)
 		(forward-line 1)
@@ -2074,9 +2074,9 @@ A positive or negative prefix argument moves by multiple screenfuls."
 	       (not (eq Info-auto-advance t))
 	       (not (eq last-command this-command)))
 	  (message "Hit %s again to go to previous node"
-		   (if (= last-command-char 0)
+		   (if (mouse-event-p last-command-event)
 		       "mouse button"
-		     (key-description (char-to-string last-command-char))))
+		     (key-description (event-key last-command-event))))
 	(Info-page-prev)
 	(setq this-command 'Info))
     (scroll-down arg)))