[Emacs-diffs] Changes to emacs/lisp/info.el

[Kim F. Storm]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.322 emacs/lisp/info.el:1.323
*** emacs/lisp/info.el:1.322    Sun Nov  3 07:01:33 2002
--- emacs/lisp/info.el  Tue Nov  5 17:39:07 2002
***************
*** 2730,2736 ****
            (add-text-properties (match-beginning 2) (1+ (match-end 2))
                                 '(invisible t))))
        (goto-char (point-min))
!       (while (re-search-forward "\\(\\*Note[ 
\n\t]+\\)\\([^:]*\\)\\(:[^.,:]*[,:]?\\)" nil t)
          (unless (= (char-after (1- (match-beginning 0))) ?\") ; hack
            (let ((next (point))
                  (hide-tag Info-hide-note-references)
--- 2730,2736 ----
            (add-text-properties (match-beginning 2) (1+ (match-end 2))
                                 '(invisible t))))
        (goto-char (point-min))
!       (while (re-search-forward "\\(\\*Note[ 
\n\t]*\\)\\([^:]*\\)\\(:[^.,:(]*\\(([^)]*)[^.,:]*\\)?[,:]?\n?\\)" nil t)
          (unless (= (char-after (1- (match-beginning 0))) ?\") ; hack
            (let ((next (point))
                  (hide-tag Info-hide-note-references)
***************
*** 2757,2773 ****
                                   '(font-lock-face info-xref
                                                    mouse-face highlight
                                                    help-echo "mouse-2: go to 
this node"))
!             (if (eq Info-hide-note-references t)
!                 (add-text-properties (match-beginning 3) (match-end 3)
!                                      '(invisible t))))))
  
        (goto-char (point-min))
        (if (and (search-forward "\n* Menu:" nil t)
                 (not (string-match "\\<Index\\>" Info-current-node))
                 ;; Don't take time to annotate huge menus
                 (< (- (point-max) (point)) Info-fontify-maximum-menu-size))
!           (let ((n 0))
!             (while (re-search-forward "^\\* +\\([^:\t\n]*\\)\\(:[^.,:]*[,:.][ 
\t]*\\)" nil t)
                (setq n (1+ n))
                (if (zerop (% n 3)) ; visual aids to help with 1-9 keys
                    (put-text-property (match-beginning 0)
--- 2757,2776 ----
                                   '(font-lock-face info-xref
                                                    mouse-face highlight
                                                    help-echo "mouse-2: go to 
this node"))
!             (when (eq Info-hide-note-references t)
!               (add-text-properties (match-beginning 3) (match-end 3)
!                                    (if (string-match "\n" (match-string 0))
!                                        '(display "\n")
!                                      '(invisible t)))))))
  
        (goto-char (point-min))
        (if (and (search-forward "\n* Menu:" nil t)
                 (not (string-match "\\<Index\\>" Info-current-node))
                 ;; Don't take time to annotate huge menus
                 (< (- (point-max) (point)) Info-fontify-maximum-menu-size))
!           (let ((n 0)
!                 cont)
!             (while (re-search-forward "^\\* 
+\\([^:\t\n]*\\)\\(:[^.,:(]*\\(([^)]*)[^.,:]*\\)?[,:.][ \t]*\\)" nil t)
                (setq n (1+ n))
                (if (zerop (% n 3)) ; visual aids to help with 1-9 keys
                    (put-text-property (match-beginning 0)
***************
*** 2777,2786 ****
                                     '(font-lock-face info-xref
                                       mouse-face highlight
                                       help-echo "mouse-2: go to this node"))
                (if (eq Info-hide-note-references t)
!                   (add-text-properties (match-beginning 2) (match-end 2)
!                                        (list 'display
!                                              (make-string (max 2 (- 22 (- 
(match-end 1) (match-beginning 1)))) ? )))))))
  
        (Info-fontify-menu-headers)
        (set-buffer-modified-p nil)))))
--- 2780,2796 ----
                                     '(font-lock-face info-xref
                                       mouse-face highlight
                                       help-echo "mouse-2: go to this node"))
+               (when (eq Info-hide-note-references t)
+                 (add-text-properties (match-beginning 2) (match-end 2)
+                                      (list 'display
+                                            (make-string (max 2 (- 22 (- 
(match-end 1) (match-beginning 1)))) ? )))
+                 (setq cont (looking-at "[ \t]*[^\n]")))
                (if (eq Info-hide-note-references t)
!                   (while (and (= (forward-line 1) 0)
!                               (looking-at "\\([ \t]+\\)[^*\n]"))
!                     (add-text-properties (match-beginning 1) (match-end 1)
!                                          (list 'display (make-string (+ 22 
(if cont 4 2)) ? )))
!                     (setq cont t))))))
  
        (Info-fontify-menu-headers)
        (set-buffer-modified-p nil)))))