Commit 93480d70 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(info-node, info-xref, info-menu-5):

Define faces with defface.
(Info-mode): Don't define faces here, and don't alter Info-fontify.
Locally set line-move-ignore-invisible.
(Info-fontify-node): Test type of frame here.
parent a815b83c
...@@ -58,6 +58,21 @@ The Lisp code is executed when the node is selected.") ...@@ -58,6 +58,21 @@ The Lisp code is executed when the node is selected.")
:type 'boolean :type 'boolean
:group 'info) :group 'info)
(defface info-node
'((t (:bold t :italic t)))
"Face for Info node names."
:group 'info)
(defface info-menu-5
'((t (:underline t)))
"Face for the fifth and tenth `*' in an Info menu."
:group 'info)
(defface info-xref
'((t (:bold t)))
"Face for Info cross-references."
:group 'info)
(defcustom Info-fontify-maximum-menu-size 30000 (defcustom Info-fontify-maximum-menu-size 30000
"*Maximum size of menu to fontify if `Info-fontify' is non-nil." "*Maximum size of menu to fontify if `Info-fontify' is non-nil."
:type 'integer :type 'integer
...@@ -1786,20 +1801,9 @@ Advanced commands: ...@@ -1786,20 +1801,9 @@ Advanced commands:
(setq Info-tag-table-buffer nil) (setq Info-tag-table-buffer nil)
(make-local-variable 'Info-history) (make-local-variable 'Info-history)
(make-local-variable 'Info-index-alternatives) (make-local-variable 'Info-index-alternatives)
(if (memq (framep (selected-frame)) '(x pc w32)) ;; This is for the sake of the invisible text we use handling titles.
(progn (make-local-variable 'line-move-ignore-invisible)
(make-face 'info-node) (setq line-move-ignore-invisible t)
(make-face 'info-menu-5)
(make-face 'info-xref)
(or (face-differs-from-default-p 'info-node)
(if (face-differs-from-default-p 'bold-italic)
(copy-face 'bold-italic 'info-node)
(copy-face 'bold 'info-node)))
(or (face-differs-from-default-p 'info-menu-5)
(set-face-underline-p 'info-menu-5 t))
(or (face-differs-from-default-p 'info-xref)
(copy-face 'bold 'info-xref)))
(setq Info-fontify nil))
(Info-set-mode-line) (Info-set-mode-line)
(run-hooks 'Info-mode-hook)) (run-hooks 'Info-mode-hook))
...@@ -1988,8 +1992,12 @@ The alist key is the character the title is underlined with (?*, ?= or ?-)." ...@@ -1988,8 +1992,12 @@ The alist key is the character the title is underlined with (?*, ?= or ?-)."
(put-text-property (match-beginning 1) (match-end 1) (put-text-property (match-beginning 1) (match-end 1)
'face 'face
(cdr (assq (preceding-char) Info-title-face-alist))) (cdr (assq (preceding-char) Info-title-face-alist)))
(put-text-property (match-end 1) (match-end 2) ;; This is a serious problem for trying to handle multiple
'invisible t)) ;; frame types at once. We want this text to be invisible
;; on frames that can display the font above.
(if (memq (framep (selected-frame)) '(x pc w32))
(put-text-property (match-end 1) (match-end 2)
'invisible t)))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "\\*Note[ \n\t]+\\([^:]*\\):" nil t) (while (re-search-forward "\\*Note[ \n\t]+\\([^:]*\\):" nil t)
(if (= (char-after (1- (match-beginning 0))) ?\") ; hack (if (= (char-after (1- (match-beginning 0))) ?\") ; hack
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment