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

[Kim F. Storm]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.320 emacs/lisp/info.el:1.321
*** emacs/lisp/info.el:1.320    Fri Nov  1 03:53:50 2002
--- emacs/lisp/info.el  Fri Nov  1 17:48:12 2002
***************
*** 146,153 ****
    :group 'info)
  
  (defcustom Info-hide-note-references t
!   "*If non-nil, hide the section reference in *note and * menu items."
!   :type 'boolean
    :group 'info)
  
  (defcustom Info-mode-hook '(turn-on-font-lock)
--- 146,158 ----
    :group 'info)
  
  (defcustom Info-hide-note-references t
!   "*If non-nil, hide the tag and section reference in *note and * menu items.
! Also replaces the \"*note\" text with \"see\".
! If value is a number, the reference section is still shown."
!   :version "21.4"
!   :type '(choice (const :tag "Replace tag and hide reference" t)
!                (const :tag "Replace only tag" tag)
!                (const :tag "No reformatting" nil))
    :group 'info)
  
  (defcustom Info-mode-hook '(turn-on-font-lock)
***************
*** 2725,2731 ****
        (while (re-search-forward "\\(\\*Note[ 
\n\t]+\\)\\([^:]*\\)\\(:[^.,:]*[,:]?\\)" nil t)
          (unless (= (char-after (1- (match-beginning 0))) ?\") ; hack
            (let ((next (point))
!                 (hide-tag font-lock-mode)
                  other-tag)
              (when hide-tag
                ;; *Note is often used where *note should have been
--- 2730,2736 ----
        (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)
                  other-tag)
              (when hide-tag
                ;; *Note is often used where *note should have been
***************
*** 2749,2755 ****
                                   '(font-lock-face info-xref
                                                    mouse-face highlight
                                                    help-echo "mouse-2: go to 
this node"))
!             (if Info-hide-note-references
                  (add-text-properties (match-beginning 3) (match-end 3)
                                       '(invisible t intangible t))))))
  
--- 2754,2760 ----
                                   '(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 intangible t))))))
  
***************
*** 2769,2775 ****
                                     '(font-lock-face info-xref
                                       mouse-face highlight
                                       help-echo "mouse-2: go to this node"))
!               (if Info-hide-note-references
                    (add-text-properties (match-beginning 2) (match-end 2)
                                         (list 'display 
                                               (make-string (max 2 (- 22 (- 
(match-end 1) (match-beginning 1)))) ? )
--- 2774,2780 ----
                                     '(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)))) ? )