[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Sun, 16 Oct 2005 10:12:04 -0400 |
Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.450 emacs/lisp/info.el:1.451
*** emacs/lisp/info.el:1.450 Wed Oct 12 19:47:24 2005
--- emacs/lisp/info.el Sun Oct 16 14:12:03 2005
***************
*** 3847,3863 ****
(paragraph-separate ".*\\.[ \t]*\n[ \t]\\|[ \t]*[-*]\\|[
\t\f]*$")
(adaptive-fill-mode nil))
(goto-char (point-max))
! (while paragraph-markers
! (let ((m (car paragraph-markers)))
! (setq paragraph-markers (cdr paragraph-markers))
! (when (< m (point))
! (goto-char m)
! (beginning-of-line)
! (let ((beg (point)))
! (when (zerop (forward-paragraph))
! (fill-individual-paragraphs beg (point) nil nil)
! (goto-char beg))))
! (set-marker m nil)))))
;; Fontify menu items
(goto-char (point-min))
--- 3847,3861 ----
(paragraph-separate ".*\\.[ \t]*\n[ \t]\\|[ \t]*[-*]\\|[
\t\f]*$")
(adaptive-fill-mode nil))
(goto-char (point-max))
! (dolist (m paragraph-markers)
! (when (< m (point))
! (goto-char m)
! (beginning-of-line)
! (let ((beg (point)))
! (when (zerop (forward-paragraph))
! (fill-individual-paragraphs beg (point) nil nil)
! (goto-char beg))))
! (set-marker m nil))))
;; Fontify menu items
(goto-char (point-min))
***************
*** 3889,3921 ****
"mouse-2: go to this node")
'mouse-face 'highlight)))
(when (or not-fontified-p fontify-visited-p)
! (add-text-properties
(match-beginning 1) (match-end 1)
! (list
! 'font-lock-face
! ;; Display visited menu items in a different face
! (if (and Info-fontify-visited-nodes
! (save-match-data
! (let ((node (if (equal (match-string 3) "")
! (match-string 1)
! (match-string 3)))
! (file (file-name-nondirectory
Info-current-file))
! (hl Info-history-list)
! res)
! (if (string-match "(\\([^)]+\\))\\([^)]*\\)"
node)
! (setq file (file-name-nondirectory
! (match-string 1 node))
! node (if (equal (match-string 2 node)
"")
! "Top"
! (match-string 2 node))))
! (while hl
! (if (and (string-equal node (nth 1 (car hl)))
! (string-equal file
! (file-name-nondirectory
! (nth 0 (car hl)))))
! (setq res (car hl) hl nil)
! (setq hl (cdr hl))))
! res))) 'info-xref-visited 'info-xref))))
(when (and not-fontified-p (memq Info-hide-note-references '(t
hide)))
(put-text-property (match-beginning 2) (1- (match-end 6))
'invisible t)
--- 3887,3918 ----
"mouse-2: go to this node")
'mouse-face 'highlight)))
(when (or not-fontified-p fontify-visited-p)
! (put-text-property
(match-beginning 1) (match-end 1)
! 'font-lock-face
! ;; Display visited menu items in a different face
! (if (and Info-fontify-visited-nodes
! (save-match-data
! (let ((node (if (equal (match-string 3) "")
! (match-string 1)
! (match-string 3)))
! (file (file-name-nondirectory
Info-current-file))
! (hl Info-history-list)
! res)
! (if (string-match "(\\([^)]+\\))\\([^)]*\\)"
node)
! (setq file (file-name-nondirectory
! (match-string 1 node))
! node (if (equal (match-string 2 node)
"")
! "Top"
! (match-string 2 node))))
! (while hl
! (if (and (string-equal node (nth 1 (car hl)))
! (string-equal file
! (file-name-nondirectory
! (nth 0 (car hl)))))
! (setq res (car hl) hl nil)
! (setq hl (cdr hl))))
! res))) 'info-xref-visited 'info-xref)))
(when (and not-fontified-p (memq Info-hide-note-references '(t
hide)))
(put-text-property (match-beginning 2) (1- (match-end 6))
'invisible t)
- [Emacs-diffs] Changes to emacs/lisp/info.el, Chong Yidong, 2005/10/01
- [Emacs-diffs] Changes to emacs/lisp/info.el, Chong Yidong, 2005/10/04
- [Emacs-diffs] Changes to emacs/lisp/info.el, Juri Linkov, 2005/10/11
- [Emacs-diffs] Changes to emacs/lisp/info.el, Stefan Monnier, 2005/10/12
- [Emacs-diffs] Changes to emacs/lisp/info.el,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/info.el, Bill Wohler, 2005/10/17
- [Emacs-diffs] Changes to emacs/lisp/info.el, Juri Linkov, 2005/10/21
- [Emacs-diffs] Changes to emacs/lisp/info.el, Richard M . Stallman, 2005/10/26