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

[Kim F. Storm]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.355 emacs/lisp/info.el:1.356
*** emacs/lisp/info.el:1.355    Fri Jun  6 12:12:56 2003
--- emacs/lisp/info.el  Mon Jun  9 18:00:34 2003
***************
*** 2859,2865 ****
          ;; on frames that can display the font above.
          (when (memq (framep (selected-frame)) '(x pc w32 mac))
            (add-text-properties (1- (match-beginning 2)) (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
--- 2859,2865 ----
          ;; on frames that can display the font above.
          (when (memq (framep (selected-frame)) '(x pc w32 mac))
            (add-text-properties (1- (match-beginning 2)) (match-end 2)
!                                '(invisible t front-sticky nil rear-nonsticky 
t))))
        (goto-char (point-min))
        (while (re-search-forward "\\(\\*Note[ \t]*\\)\n?[ 
\t]*\\([^:]*\\)\\(:[^.,:(]*\\(([^)]*)[^.,:]*\\)?[,:]?\n?\\)" nil t)
          (unless (= (char-after (1- (match-beginning 0))) ?\") ; hack
***************
*** 2882,2888 ****
                (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)
               (cons 'help-echo
--- 2882,2888 ----
                (goto-char next))
              (if hide-tag
                  (add-text-properties (match-beginning 1) (match-end 1)
!                                      '(invisible t front-sticky nil 
rear-nonsticky t)))
              (add-text-properties
               (match-beginning 2) (match-end 2)
               (cons 'help-echo
***************
*** 2893,2899 ****
                             mouse-face highlight))))
              (when (eq Info-hide-note-references t)
                (add-text-properties (match-beginning 3) (match-end 3)
!                                    '(invisible t)))
              (when other-tag
                (save-excursion
                  (goto-char (match-beginning 1))
--- 2893,2899 ----
                             mouse-face highlight))))
              (when (eq Info-hide-note-references t)
                (add-text-properties (match-beginning 3) (match-end 3)
!                                    '(invisible t front-sticky nil 
rear-nonsticky t)))
              (when other-tag
                (save-excursion
                  (goto-char (match-beginning 1))
***************
*** 2913,2923 ****
              (setq paragraph-markers (cdr paragraph-markers))
              (when (< m (point))
                (goto-char m)
!               (move-to-left-margin)
!               (when (zerop (forward-paragraph))
!                 (let ((end (point))
!                       (beg (progn (backward-paragraph) (point))))
!                   (fill-individual-paragraphs beg end nil nil)
                    (goto-char beg))))
              (set-marker m nil))))
  
--- 2913,2922 ----
              (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))))