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

[Andreas Schwab]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.338 emacs/lisp/info.el:1.339
*** emacs/lisp/info.el:1.338    Thu Feb 20 07:40:36 2003
--- emacs/lisp/info.el  Sun Mar  2 18:33:56 2003
***************
*** 154,164 ****
  (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)
--- 154,164 ----
  (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 non-nil but not t, the reference section is still shown."
    :version "21.4"
!   :type '(choice (const :tag "No reformatting" nil)
!                (const :tag "Replace tag and hide reference" t)
!                (other :tag "Replace only tag" tag))
    :group 'info)
  
  (defcustom Info-mode-hook '(turn-on-font-lock)
***************
*** 2789,2795 ****
            (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 ((start (match-beginning 0))
                  (next (point))
--- 2789,2795 ----
            (add-text-properties (match-beginning 2) (1+ (match-end 2))
                                 '(invisible t))))
        (goto-char (point-min))
!       (while (re-search-forward "\\(\\*Note[ \t]*\\)\n?[ 
\t]*\\([^:]*\\)\\(:[^.,:(]*\\(([^)]*)[^.,:]*\\)?[,:]?\n?\\)" nil t)
          (unless (= (char-after (1- (match-beginning 0))) ?\") ; hack
            (let ((start (match-beginning 0))
                  (next (point))
***************
*** 2819,2826 ****
                (add-text-properties (match-beginning 3) (match-end 3)
                                     '(invisible t)))
              (when other-tag
!               (goto-char (match-beginning 1))
!               (insert other-tag))
              (when (or hide-tag (eq Info-hide-note-references t))
                (setq paragraph-markers (cons (set-marker (make-marker) start)
                                              paragraph-markers))))))
--- 2819,2827 ----
                (add-text-properties (match-beginning 3) (match-end 3)
                                     '(invisible t)))
              (when other-tag
!               (save-excursion
!                 (goto-char (match-beginning 1))
!                 (insert other-tag)))
              (when (or hide-tag (eq Info-hide-note-references t))
                (setq paragraph-markers (cons (set-marker (make-marker) start)
                                              paragraph-markers))))))