* nnmail.el (nnmail-cache-insert): make sure that the

[gnus] / lisp / flow-fill.el

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 1b62a48..3add6bf 100644 (file)
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -1,6 +1,6 @@
 ;;; flow-fill.el --- interprete RFC2646 "flowed" text
 
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
@@ -43,7 +43,7 @@
 ;; 2000-02-17  posted on ding mailing list
 ;; 2000-02-19  use `point-at-{b,e}ol' in XEmacs
 ;; 2000-03-11  no compile warnings for point-at-bol stuff
-;; 2000-03-26  commited to gnus cvs
+;; 2000-03-26  committed to gnus cvs
 ;; 2000-10-23  don't flow "-- " lines, make "quote-depth wins" rule
 ;;             work when first line is at level 0.
 ;; 2002-01-12  probably incomplete encoding support
@@ -54,7 +54,7 @@
 
 (defcustom fill-flowed-display-column 'fill-column
   "Column beyond which format=flowed lines are wrapped, when displayed.
-This can be a lisp expression or an integer."
+This can be a Lisp expression or an integer."
   :type '(choice (const :tag "Standard `fill-column'" fill-column)
                 (const :tag "Fit Window" (- (window-width) 5))
                 (sexp)
@@ -62,7 +62,7 @@ This can be a lisp expression or an integer."
 
 (defcustom fill-flowed-encode-column 66
   "Column beyond which format=flowed lines are wrapped, in outgoing messages.
-This can be a lisp expression or an integer.
+This can be a Lisp expression or an integer.
 RFC 2646 suggests 66 characters for readability."
   :type '(choice (const :tag "Standard fill-column" fill-column)
                 (const :tag "RFC 2646 default (66)" 66)
@@ -80,6 +80,7 @@ RFC 2646 suggests 66 characters for readability."
            'point-at-eol
          'line-end-position)))
 
+;;;###autoload
 (defun fill-flowed-encode (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
     ;; No point in doing this unless hard newlines is used.
@@ -101,6 +102,7 @@ RFC 2646 suggests 66 characters for readability."
          (goto-char (setq start (1+ end)))))
       t)))
 
+;;;###autoload
 (defun fill-flowed (&optional buffer)
   (save-excursion
     (set-buffer (or (current-buffer) buffer))
@@ -109,7 +111,8 @@ RFC 2646 suggests 66 characters for readability."
       (when (save-excursion
              (beginning-of-line)
              (looking-at "^\\(>*\\)\\( ?\\)"))
-       (let ((quote (match-string 1)) sig)
+       (let ((quote (match-string 1))
+             sig)
          (if (string= quote "")
              (setq quote nil))
          (when (and quote (string= (match-string 2) ""))
@@ -126,7 +129,8 @@ RFC 2646 suggests 66 characters for readability."
                      (save-excursion
                        (unless (eobp)
                          (forward-char 1)
-                         (looking-at (format "^\\(%s\\)\\([^>]\\)" (or quote " ?"))))))
+                         (looking-at (format "^\\(%s\\)\\([^>\n\r]\\)"
+                                             (or quote " ?"))))))
            (save-excursion
              (replace-match (if (string= (match-string 2) " ")
                                 "" "\\2")))
@@ -138,9 +142,12 @@ RFC 2646 suggests 66 characters for readability."
                      (fill-column (eval fill-flowed-display-column))
                      filladapt-mode)
                  (fill-region (fill-flowed-point-at-bol)
-                              (min (1+ (fill-flowed-point-at-eol)) (point-max))
+                              (min (1+ (fill-flowed-point-at-eol))
+                                   (point-max))
                               'left 'nosqueeze))
-             (error nil))))))))
+             (error
+              (forward-line 1)
+              nil))))))))
 
 (provide 'flow-fill)