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

[Kim F. Storm]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.323 emacs/lisp/info.el:1.324
*** emacs/lisp/info.el:1.323    Tue Nov  5 17:39:07 2002
--- emacs/lisp/info.el  Wed Nov 13 18:34:45 2002
***************
*** 2658,2664 ****
    (unless (next-property-change (point-min))
      (save-excursion
        (let ((inhibit-read-only t)
!           (case-fold-search t))
        (goto-char (point-min))
        (when (looking-at "^\\(File: [^,: \t]+,?[ \t]+\\)?")
          (goto-char (match-end 0))
--- 2658,2665 ----
    (unless (next-property-change (point-min))
      (save-excursion
        (let ((inhibit-read-only t)
!           (case-fold-search t)
!           paragraph-markers)
        (goto-char (point-min))
        (when (looking-at "^\\(File: [^,: \t]+,?[ \t]+\\)?")
          (goto-char (match-end 0))
***************
*** 2732,2743 ****
        (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)
                  other-tag)
              (when hide-tag
                ;; *Note is often used where *note should have been
!               (goto-char (match-beginning 0))
                (skip-syntax-backward " ")
                (setq other-tag
                      (cond
--- 2733,2745 ----
        (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))
                  (hide-tag Info-hide-note-references)
                  other-tag)
              (when hide-tag
                ;; *Note is often used where *note should have been
!               (goto-char start)
                (skip-syntax-backward " ")
                (setq other-tag
                      (cond
***************
*** 2750,2767 ****
                (goto-char next))
              (if hide-tag
                  (add-text-properties (match-beginning 1) (match-end 1)
!                                      (if other-tag
!                                          (list 'display other-tag)
!                                        '(invisible t))))
              (add-text-properties (match-beginning 2) (match-end 2)
                                   '(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)
--- 2752,2782 ----
                (goto-char next))
              (if hide-tag
                  (add-text-properties (match-beginning 1) (match-end 1)
!                                      '(invisible t)))
              (add-text-properties (match-beginning 2) (match-end 2)
                                   '(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)
!                                    '(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))))))
! 
!       (let ((fill-nobreak-invisible t))
!         (goto-char (point-max))
!         (while paragraph-markers
!           (let ((m (car paragraph-markers)))
!             (setq paragraph-markers (cdr paragraph-markers))
!             (when (< m (point))
!               (goto-char m)
!               (fill-paragraph nil)
!               (backward-paragraph 1))
!             (set-marker m nil))))
  
        (goto-char (point-min))
        (if (and (search-forward "\n* Menu:" nil t)