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

[Eli Zaretskii]

Index: emacs/lisp/textmodes/fill.el
diff -c emacs/lisp/textmodes/fill.el:1.176 emacs/lisp/textmodes/fill.el:1.177
*** emacs/lisp/textmodes/fill.el:1.176  Thu May 19 19:06:19 2005
--- emacs/lisp/textmodes/fill.el        Sat Jun 11 13:49:56 2005
***************
*** 115,121 ****
  
  (defcustom adaptive-fill-function nil
    "*Function to call to choose a fill prefix for a paragraph, or nil.
! This function is used when `adaptive-fill-regexp' does not match."
    :type '(choice (const nil) function)
    :group 'fill)
  
--- 115,121 ----
  
  (defcustom adaptive-fill-function nil
    "*Function to call to choose a fill prefix for a paragraph, or nil.
! nil means the function has not determined the fill prefix."
    :type '(choice (const nil) function)
    :group 'fill)
  
***************
*** 230,238 ****
            ;; Also setting first-line-prefix to nil prevents
            ;; second-line-prefix from being used.
            (cond ;; ((looking-at paragraph-start) nil)
                  ((and adaptive-fill-regexp (looking-at adaptive-fill-regexp))
!                  (match-string-no-properties 0))
!                 (adaptive-fill-function (funcall adaptive-fill-function))))
        (forward-line 1)
        (if (< (point) to)
        (progn
--- 230,238 ----
            ;; Also setting first-line-prefix to nil prevents
            ;; second-line-prefix from being used.
            (cond ;; ((looking-at paragraph-start) nil)
+                 ((and adaptive-fill-function (funcall 
adaptive-fill-function)))
                  ((and adaptive-fill-regexp (looking-at adaptive-fill-regexp))
!                  (match-string-no-properties 0))))
        (forward-line 1)
        (if (< (point) to)
        (progn
***************
*** 240,250 ****
          (setq start (point))
          (setq second-line-prefix
                (cond ((looking-at paragraph-start) nil) ;Can it happen ? -stef
                      ((and adaptive-fill-regexp
                            (looking-at adaptive-fill-regexp))
!                      (buffer-substring-no-properties start (match-end 0)))
!                     (adaptive-fill-function
!                      (funcall adaptive-fill-function))))
          ;; If we get a fill prefix from the second line,
          ;; make sure it or something compatible is on the first line too.
          (when second-line-prefix
--- 240,250 ----
          (setq start (point))
          (setq second-line-prefix
                (cond ((looking-at paragraph-start) nil) ;Can it happen ? -stef
+                     ((and adaptive-fill-function
+                           (funcall adaptive-fill-function)))
                      ((and adaptive-fill-regexp
                            (looking-at adaptive-fill-regexp))
!                      (buffer-substring-no-properties start (match-end 0)))))
          ;; If we get a fill prefix from the second line,
          ;; make sure it or something compatible is on the first line too.
          (when second-line-prefix