aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2007-02-10 11:10:49 +0000
committerEli Zaretskii2007-02-10 11:10:49 +0000
commit3d0fc0b76d9a0327b90e500f0d9a3a3251114c29 (patch)
tree3f409e49ecb20875faa37062a4f886d8a8eab3e1
parent7ea2a12d0f418dfa0a2b825d82336d1d9c539ca2 (diff)
downloademacs-3d0fc0b76d9a0327b90e500f0d9a3a3251114c29.tar.gz
emacs-3d0fc0b76d9a0327b90e500f0d9a3a3251114c29.zip
(Info-fontify-maximum-menu-size): Document the effect of a nil value.
(Info-fontify-node): Make sure Info-fontify-maximum-menu-size is non-nil before using it as size.
-rw-r--r--lisp/info.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/info.el b/lisp/info.el
index fb124d6ff54..ec2ff23b57e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -146,7 +146,8 @@ The Lisp code is executed when the node is selected.")
146 :group 'info) 146 :group 'info)
147 147
148(defcustom Info-fontify-maximum-menu-size 1000000 148(defcustom Info-fontify-maximum-menu-size 1000000
149 "*Maximum size of menu to fontify if `font-lock-mode' is non-nil." 149 "*Maximum size of menu to fontify if `font-lock-mode' is non-nil.
150Set to nil to disable node fontification."
150 :type 'integer 151 :type 'integer
151 :group 'info) 152 :group 'info)
152 153
@@ -3705,6 +3706,7 @@ the variable `Info-file-list-for-emacs'."
3705 (fontify-visited-p ; visited nodes need to be re-fontified 3706 (fontify-visited-p ; visited nodes need to be re-fontified
3706 (and Info-fontify-visited-nodes 3707 (and Info-fontify-visited-nodes
3707 ;; Don't take time to refontify visited nodes in huge nodes 3708 ;; Don't take time to refontify visited nodes in huge nodes
3709 Info-fontify-maximum-menu-size
3708 (< (- (point-max) (point-min)) Info-fontify-maximum-menu-size))) 3710 (< (- (point-max) (point-min)) Info-fontify-maximum-menu-size)))
3709 rbeg rend) 3711 rbeg rend)
3710 3712
@@ -3940,6 +3942,7 @@ the variable `Info-file-list-for-emacs'."
3940 (when (and (or not-fontified-p fontify-visited-p) 3942 (when (and (or not-fontified-p fontify-visited-p)
3941 (search-forward "\n* Menu:" nil t) 3943 (search-forward "\n* Menu:" nil t)
3942 ;; Don't take time to annotate huge menus 3944 ;; Don't take time to annotate huge menus
3945 Info-fontify-maximum-menu-size
3943 (< (- (point-max) (point)) Info-fontify-maximum-menu-size)) 3946 (< (- (point-max) (point)) Info-fontify-maximum-menu-size))
3944 (let ((n 0) 3947 (let ((n 0)
3945 cont) 3948 cont)