Revision: emacs@sv.gnu.org/emacs--devo--0--patch-118

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 38-39)

   - Update from CVS

8 files changed, 59 insertions, 10 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c77c92d05c7..87327dde482 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,38 @@
+2006-02-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil.
+        Remove space stuffing, and only do quotes that actually start with
+        ">" at the beginning of the lines.
+        Merge of 2005-11-17 and 2004-07-25 from the trunk.
+
+2006-02-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * utf7.el (utf7-utf-16-coding-system): Fix comment.  utf-16-be is
+        also available in Emacs 21.3.
+
+        * message.el (message-fix-before-sending): Change "Emacs 22" to
+        "Emacs 23 (unicode)" in comment.
+
+        * qp.el (quoted-printable-encode-region): Change "Emacs 22" to
+        "Emacs 23 (unicode)" in comment.
+
+        * mm-util.el: Change "Emacs 22" to "Emacs 23 (unicode)" in
+        comment.
+        (mm-coding-system-p): Add comment about no-MULE XEmacs.
+
+        * mm-view.el (mm-fill-flowed): Add :version.
+
+2006-02-23  Ralf Angeli  <angeli@iwi.uni-sb.de>
+
+        * mm-view.el (mm-fill-flowed): New variable.
+        (mm-inline-text): Use it.
+
+2006-02-21  Wolfram Fenske  <wolfram.fenske@student.uni-magdeburg.de>
+        (tiny change)
+
+        * nnimap.el (nnimap-request-move-article): Change folder back to
+        source group before deleting.
+
 2006-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * rfc2047.el (rfc2047-charset-to-coding-system): Don't check the
@@ -1266,7 +1301,7 @@
 
         * gnus-topic.el (gnus-topic-mode): Ditto.
 
-2005-07-08  Ralf Angeli  <angeli@iwi.uni-sb.de>  (tiny change)
+2005-07-08  Ralf Angeli  <angeli@iwi.uni-sb.de>
 
         * gnus-art.el (gnus-article-next-page, gnus-article-next-page-1)
         (gnus-article-prev-page): Take scroll-margin into consideration.
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index c3f7f7bb20e..480505549c9 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -113,10 +113,15 @@ RFC 2646 suggests 66 characters for readability."
   (save-excursion
     (set-buffer (or (current-buffer) buffer))
     (goto-char (point-min))
+    ;; Remove space stuffing.
+    (while (re-search-forward "^ " nil t)
+      (delete-char -1)
+      (forward-line 1))
+    (goto-char (point-min))
     (while (re-search-forward " $" nil t)
       (when (save-excursion
               (beginning-of-line)
-              (looking-at "^\\(>*\\)\\( ?\\)"))
+              (looking-at "^\\(>+\\)\\( ?\\)"))
         (let ((quote (match-string 1))
               sig)
           (if (string= quote "")
@@ -146,7 +151,8 @@ RFC 2646 suggests 66 characters for readability."
             (condition-case nil
                 (let ((fill-prefix (when quote (concat quote " ")))
                       (fill-column (eval fill-flowed-display-column))
-                      filladapt-mode)
+                      filladapt-mode
+                      adaptive-fill-mode)
                   (fill-region (fill-flowed-point-at-bol)
                                (min (1+ (fill-flowed-point-at-eol))
                                     (point-max))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 28325b73e26..1bdc2f6a11f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3615,8 +3615,8 @@ It should typically alter the sending method in some way or other."
           (when (let ((char (char-after)))
                   (or (< (mm-char-int char) 128)
                       (and (mm-multibyte-p)
-                           ;; Fixme: Wrong for Emacs 22 and for things
-                           ;; like undecable utf-8.  Should at least
+                           ;; FIXME: Wrong for Emacs 23 (unicode) and for
+                           ;; things like undecable utf-8.  Should at least
                            ;; use find-coding-systems-region.
                            (memq (char-charset char)
                                  '(eight-bit-control eight-bit-graphic
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 9bdbc3c72b1..a7f375aeba8 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -174,7 +174,7 @@ system object in XEmacs."
     (if (fboundp 'coding-system-p)
         (when (coding-system-p cs)
           cs)
-      ;; Is this branch ever actually useful?
+      ;; no-MULE XEmacs:
       (car (memq cs (mm-get-coding-system-list))))))
 
 (defvar mm-charset-synonym-alist
@@ -331,7 +331,7 @@ with Mule charsets.  It is completely useless for Emacs."
           cs mime mule alist)
       (while css
         (setq cs (pop css)
-              mime (or (coding-system-get cs :mime-charset) ; Emacs 22
+              mime (or (coding-system-get cs :mime-charset) ; Emacs 23 (unicode)
                        (coding-system-get cs 'mime-charset)))
         (when (and mime
                    (not (eq t (setq mule
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 43d6bddf194..c2b4e19f806 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -72,6 +72,12 @@
     (html2text  html2text))
   "The attributes of washer types for text/html.")
 
+(defcustom mm-fill-flowed t
+  "If non-nil an format=flowed article will be displayed flowed."
+  :type 'boolean
+  :version "22.1"
+  :group 'mime-display)
+
 ;;; Internal variables.
 
 ;;;
@@ -407,7 +413,8 @@
           (mm-insert-part handle)
           (goto-char (point-max)))
       (insert (mm-decode-string (mm-get-part handle) charset)))
-    (when (and (equal type "plain")
+    (when (and mm-fill-flowed
+               (equal type "plain")
                (equal (cdr (assoc 'format (mm-handle-type handle)))
                       "flowed"))
       (save-restriction
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 26c0f8901ee..3c05b3713ea 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1492,6 +1492,7 @@ function is generally only called when Gnus is shutting down."
                (setq result (eval accept-form))
                (kill-buffer buf)
                result)
+             (nnimap-possibly-change-group group server)
              (imap-message-flags-add
               (imap-range-to-message-set (list article))
               "\\Deleted" 'silent nnimap-server-buffer))
diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index cb89a3550ba..15914922d1c 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -118,7 +118,7 @@ encode lines starting with \"From\"."
                   (not (eobp)))
         (insert
          (prog1
-             ;; To unibyte in case of Emacs 22 eight-bit.
+             ;; To unibyte in case of Emacs 23 (unicode) eight-bit.
              (format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
            (delete-char 1))))
       ;; Encode white space at the end of lines.
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el
index bb47077612e..a1b7fdc6702 100644
--- a/lisp/gnus/utf7.el
+++ b/lisp/gnus/utf7.el
@@ -80,7 +80,7 @@
 (defconst utf7-utf-16-coding-system
   (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
          'utf-16-be-no-signature)
-        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1
+        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22
               ;; Avoid versions with BOM.
               (= 2 (length (encode-coding-string "a" 'utf-16-be))))
          'utf-16-be)