Drew Adams <drew.adams at oracle.com>

[bpt/emacs.git] / lisp / info-look.el

diff --git a/lisp/info-look.el b/lisp/info-look.el
index 5097f2f..4ed13ba 100644 (file)
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -2,7 +2,7 @@
 ;; An older version of this was known as libc.el.
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;;         (did not show signs of life (Nov 2001)  -stef)
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -144,7 +144,7 @@ to `symbol', and the help mode defaults to the current major mode."
   (apply 'info-lookup-add-help* nil arg))
 
 (defun info-lookup-maybe-add-help (&rest arg)
-  "Add a help specification iff none is defined.
+  "Add a help specification if none is defined.
 See the documentation of the function `info-lookup-add-help'
 for more details."
   (apply 'info-lookup-add-help* t arg))
@@ -353,8 +353,11 @@ If optional argument QUERY is non-nil, query for the help mode."
              suffix (nth 3 (car doc-spec)))
        (when (condition-case error-data
                  (progn
-                   (Info-goto-node node)
-                   (setq doc-found t))
+                   ;; Don't need Index menu fontifications here, and
+                   ;; they slow down the lookup.
+                   (let (Info-fontify-maximum-menu-size)
+                     (Info-goto-node node)
+                     (setq doc-found t)))
                (error
                 (message "Cannot access Info node %s" node)
                 (sit-for 1)
@@ -441,6 +444,7 @@ If optional argument QUERY is non-nil, query for the help mode."
   (let ((doc-spec (info-lookup->doc-spec topic mode))
        (regexp (concat "^\\(" (info-lookup->regexp topic mode)
                        "\\)\\([ \t].*\\)?$"))
+       Info-fontify-maximum-menu-size
        node trans entry item prefix result doc-found
        (buffer (get-buffer-create " temp-info-look")))
     (with-current-buffer buffer