aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-10-20 02:58:00 +0000
committerMiles Bader2000-10-20 02:58:00 +0000
commita8b883c2c83988072f8d67d1fac53c3f92952461 (patch)
treed55753e478463ac8e19574f3b8ab260796255260
parentc8ae03abbe093684a62f3c627fcdb1d6ceab4457 (diff)
downloademacs-a8b883c2c83988072f8d67d1fac53c3f92952461.tar.gz
emacs-a8b883c2c83988072f8d67d1fac53c3f92952461.zip
(Info-fontify-node):
Add support for @subsubsection titles, which use `Info-title-4-face'. (Info-title-4-face): New face. (Info-title-3-face): Inherit from Info-title-4-face instead of variable-pitch.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/info.el13
2 files changed, 18 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c83f1f0eb6..a31de5e7d6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12000-10-20 Miles Bader <miles@lsi.nec.co.jp>
2
3 * info.el (Info-fontify-node): Add support for @subsubsection
4 titles, which use `Info-title-4-face'.
5 (Info-title-4-face): New face.
6 (Info-title-3-face): Inherit from Info-title-4-face instead of
7 variable-pitch.
8
12000-10-19 Jason Rumney <jasonr@gnu.org> 92000-10-19 Jason Rumney <jasonr@gnu.org>
2 10
3 * dired.el (dired-insert-directory): Do not let errors signalled by 11 * dired.el (dired-insert-directory): Do not let errors signalled by
diff --git a/lisp/info.el b/lisp/info.el
index 5817e6face1..fb228dd4372 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2373,10 +2373,16 @@ the variable `Info-file-list-for-emacs'."
2373 2373
2374(defface Info-title-3-face 2374(defface Info-title-3-face
2375 '((((type tty pc) (class color)) (:weight bold)) 2375 '((((type tty pc) (class color)) (:weight bold))
2376 (t (:height 1.2 :weight bold :inherit variable-pitch))) 2376 (t (:height 1.2 :inherit Info-title-4-face)))
2377 "Face for Info titles at level 3." 2377 "Face for Info titles at level 3."
2378 :group 'info) 2378 :group 'info)
2379 2379
2380(defface Info-title-4-face
2381 '((((type tty pc) (class color)) (:weight bold))
2382 (t (:weight bold :inherit variable-pitch)))
2383 "Face for Info titles at level 4."
2384 :group 'info)
2385
2380(defun Info-fontify-node () 2386(defun Info-fontify-node ()
2381 (save-excursion 2387 (save-excursion
2382 (let ((buffer-read-only nil) 2388 (let ((buffer-read-only nil)
@@ -2408,13 +2414,14 @@ the variable `Info-file-list-for-emacs'."
2408 (put-text-property tbeg nend 'local-map keymap)))) 2414 (put-text-property tbeg nend 'local-map keymap))))
2409 )))) 2415 ))))
2410 (goto-char (point-min)) 2416 (goto-char (point-min))
2411 (while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*+\\|=+\\|-+\\)$" 2417 (while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*+\\|=+\\|-+\\|\\.+\\)$"
2412 nil t) 2418 nil t)
2413 (let ((c (preceding-char)) 2419 (let ((c (preceding-char))
2414 face) 2420 face)
2415 (cond ((= c ?*) (setq face 'Info-title-1-face)) 2421 (cond ((= c ?*) (setq face 'Info-title-1-face))
2416 ((= c ?=) (setq face 'Info-title-2-face)) 2422 ((= c ?=) (setq face 'Info-title-2-face))
2417 (t (setq face 'Info-title-3-face))) 2423 ((= c ?-) (setq face 'Info-title-3-face))
2424 (t (setq face 'Info-title-4-face)))
2418 (put-text-property (match-beginning 1) (match-end 1) 2425 (put-text-property (match-beginning 1) (match-end 1)
2419 'face face)) 2426 'face face))
2420 ;; This is a serious problem for trying to handle multiple 2427 ;; This is a serious problem for trying to handle multiple