2002-09-25 Bj\e,Av\e(Brn Torkelsson <torkel@acc.umu.se>

[gnus] / lisp / flow-fill.el

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 4f6b268..1b62a48 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 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
@@ -60,7 +60,7 @@ This can be a lisp expression or an integer."
                 (sexp)
                 (integer)))
 
-(defcustom fill-flowed-encode-columnq 66
+(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.
 RFC 2646 suggests 66 characters for readability."
@@ -133,11 +133,14 @@ RFC 2646 suggests 66 characters for readability."
            (backward-delete-char -1)
            (end-of-line))
          (unless sig
-           (let ((fill-prefix (when quote (concat quote " ")))
-                 (fill-column (eval fill-flowed-display-column)))
-             (fill-region (fill-flowed-point-at-bol)
-                          (min (1+ (fill-flowed-point-at-eol)) (point-max))
-                          'left 'nosqueeze))))))))
+           (condition-case nil
+               (let ((fill-prefix (when quote (concat quote " ")))
+                     (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))
+                              'left 'nosqueeze))
+             (error nil))))))))
 
 (provide 'flow-fill)