flow-fill.el (fill-flowed-encode): Do encoding citation-aware.

gnus-art.el (gnus-treat-fill-long-lines): Add missing version tag.
gnus-msg.el (gnus-message-replyencrypt): Fix typo in version string.

4 files changed, 39 insertions, 15 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5d2263657fe..10d2cc4c663 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * flow-fill.el (fill-flowed-encode): Do encoding citation-aware.
+
 2011-01-03  Glenn Morris  <rgm@gnu.org>
 
         * sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index 2420577ea45..66422d2f7d4 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -1,7 +1,7 @@
 ;;; flow-fill.el --- interpret RFC2646 "flowed" text
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
@@ -82,19 +82,38 @@ RFC 2646 suggests 66 characters for readability."
         ;; Go through each paragraph, filling it and adding SPC
         ;; as the last character on each line.
         (while (setq end (text-property-any start (point-max) 'hard 't))
-          (let ((fill-column (eval fill-flowed-encode-column)))
-            (fill-region start end t 'nosqueeze 'to-eop))
-          (goto-char start)
-          ;; `fill-region' probably distorted end.
-          (setq end (text-property-any start (point-max) 'hard 't))
-          (while (and (< (point) end)
-                      (re-search-forward "$" (1- end) t))
-            (insert " ")
-            (setq end (1+ end))
-            (forward-char))
-          (goto-char (setq start (1+ end)))))
+          (save-restriction
+            (narrow-to-region start end)
+            (let ((fill-column (eval fill-flowed-encode-column)))
+              (fill-flowed-fill-buffer))
+            (goto-char (point-min))
+            (while (re-search-forward "\n" nil t)
+              (replace-match " \n" t t))
+            (goto-char (setq start (1+ (point-max)))))))
       t)))
 
+(defun fill-flowed-fill-buffer ()
+  (let ((prefix nil)
+        (prev-prefix nil)
+        (start (point-min)))
+    (goto-char (point-min))
+    (while (not (eobp))
+      (setq prefix (and (looking-at "[> ]+")
+                        (match-string 0)))
+      (if (equal prefix prev-prefix)
+          (forward-line 1)
+        (save-restriction
+          (narrow-to-region start (point))
+          (let ((fill-prefix prev-prefix))
+            (fill-region (point-min) (point-max) t 'nosqueeze 'to-eop))
+          (goto-char (point-max)))
+        (setq prev-prefix prefix
+              start (point))))
+    (save-restriction
+      (narrow-to-region start (point))
+      (let ((fill-prefix prev-prefix))
+        (fill-region (point-min) (point-max) t 'nosqueeze 'to-eop)))))
+
 ;;;###autoload
 (defun fill-flowed (&optional buffer delete-space)
   (with-current-buffer (or (current-buffer) buffer)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index bf1b1b5b365..36944267ad2 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1,7 +1,7 @@
 ;;; gnus-art.el --- article mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -1594,6 +1594,7 @@ predicate.  See Info node `(gnus)Customizing Articles'."
   "Fill long lines.
 Valid values are nil, t, `head', `first', `last', an integer or a
 predicate.  See Info node `(gnus)Customizing Articles'."
+  :version "24.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index c4ea66a4257..d66e1692a80 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -247,7 +247,7 @@ See also the `mml-default-sign-method' variable."
 (defcustom gnus-message-replyencrypt t
   "Automatically encrypt replies to encrypted messages.
 See also the `mml-default-encrypt-method' variable."
-  :version "22.1"
+  :version "24.1"
   :group 'gnus-message
   :type 'boolean)