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

Merge from gnus--rel--5.10

Patches applied:

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

   - Update from CVS

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1a786f..2e96d2d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,7 +15,7 @@
        * 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 23" to
+       * 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

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index e54100a..00a338a 100644 (file)
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -110,7 +110,7 @@ RFC 2646 suggests 66 characters for readability."
     (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 "")

diff --git a/lisp/message.el b/lisp/message.el
index 973b762..af8b019 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3708,7 +3708,7 @@ not have PROP."
          (when (let ((char (char-after)))
                  (or (< (mm-char-int char) 128)
                      (and (mm-multibyte-p)
-                          ;; Fixme: Wrong for Emacs 23 (unicode) and for
+                          ;; 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)