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

[Kim F. Storm]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.359 emacs/lisp/info.el:1.360
*** emacs/lisp/info.el:1.359    Tue Jul  1 20:57:20 2003
--- emacs/lisp/info.el  Fri Jul  4 17:40:22 2003
***************
*** 162,167 ****
--- 162,175 ----
                 (other :tag "Replace only tag" tag))
    :group 'info)
  
+ (defcustom Info-refill-paragraphs nil
+   "*If non-nil, attempt to refill paragraphs with hidden references.
+ This refilling may accidentally remove explicit line breaks in the info
+ file, so be prepared for a few surprises if you enable this feature."
+   :version "21.4"
+   :type 'boolean
+   :group 'info)
+ 
  (defcustom Info-mode-hook
    ;; Try to obey obsolete Info-fontify settings.
    (unless (and (boundp 'Info-fontify) (null Info-fontify))
***************
*** 2905,2931 ****
                (save-excursion
                  (goto-char (match-beginning 1))
                  (insert other-tag)))
!             (when (or hide-tag (eq Info-hide-note-references t))
                (push (set-marker (make-marker) start)
                      paragraph-markers)))))
  
!       (let ((fill-nobreak-invisible t)
!             (fill-individual-varying-indent nil)
!             (paragraph-start "\f\\|[ \t]*[-*]\\|[ \t]*$")
!             (paragraph-separate ".*\\.[ \t]*\n[ \t]\\|[ \t]*[-*]\\|[ \t\f]*$")
!             (adaptive-fill-mode nil))
!         (goto-char (point-max))
!         (while paragraph-markers
!           (let ((m (car paragraph-markers)))
!             (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))))
  
        (goto-char (point-min))
        (when (and (search-forward "\n* Menu:" nil t)
--- 2913,2942 ----
                (save-excursion
                  (goto-char (match-beginning 1))
                  (insert other-tag)))
!             (when (and Info-refill-paragraphs
!                        (or hide-tag (eq Info-hide-note-references t)))
                (push (set-marker (make-marker) start)
                      paragraph-markers)))))
  
!       (when (and Info-refill-paragraphs
!                  paragraph-markers)
!         (let ((fill-nobreak-invisible t)
!               (fill-individual-varying-indent nil)
!               (paragraph-start "\f\\|[ \t]*[-*]\\|[ \t]*$")
!               (paragraph-separate ".*\\.[ \t]*\n[ \t]\\|[ \t]*[-*]\\|[ 
\t\f]*$")
!               (adaptive-fill-mode nil))
!           (goto-char (point-max))
!           (while paragraph-markers
!             (let ((m (car paragraph-markers)))
!               (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)))))
  
        (goto-char (point-min))
        (when (and (search-forward "\n* Menu:" nil t)