diff lisp/packages/info.el @ 177:6075d714658b r20-3b15

Import from CVS: tag r20-3b15
author cvs
date Mon, 13 Aug 2007 09:51:16 +0200
parents 8eaf7971accc
children bfd6434d15b3
line wrap: on
line diff
--- a/lisp/packages/info.el	Mon Aug 13 09:50:16 2007 +0200
+++ b/lisp/packages/info.el	Mon Aug 13 09:51:16 2007 +0200
@@ -1899,7 +1899,9 @@
     (bury-buffer (current-buffer))
     (if (and (featurep 'toolbar)
 	     (eq toolbar-info-frame (selected-frame)))
-	(delete-frame toolbar-info-frame)
+	(condition-case ()
+	    (delete-frame toolbar-info-frame)
+	  (error (bury-buffer)))
       (switch-to-buffer (other-buffer (current-buffer))))))
 
 (defun Info-undefined ()
@@ -2343,7 +2345,8 @@
 ;;	       (not (string-match "\\<Index\\>" Info-current-node))
 ;;	       (< (- (point-max) (point)) 10000)
 	       )
-	  (while (re-search-forward "^\\* \\([^:\t\n]*\\):" nil t)
+	  (while (re-search-forward
+		  "^\\* \\([^\t\n]*\\):?:[ \t\n]" nil t)
 	    (Info-highlight-region (match-beginning 1) (match-end 1)
 				   'info-node ;lucid
 				   )))