(rmail-current-subject-regexp): Allow more than one space after "Subject:".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1793d7963e95d5f2e3083048d0a00e0366218bcd..fca25ad829b1c2c1a22249cb38007fc023ea6faa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+       * mail/rmail.el (rmail-current-subject-regexp): Allow more than
+       one space after "Subject:".
+
 2007-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
        * subr.el (make-variable-frame-local):

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 30731c2bea9f2dfab1749b2aa355ad3fdfa67dd5..0dd65f5191a46c46ae1d39d31a391b1c3a12c1a4 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3281,7 +3281,9 @@ and more whitespace.  The returned regular expressions contains
     (setq subject (regexp-quote subject))
     (setq subject
          (replace-regexp-in-string "[ \t\n]+" "[ \t\n]+" subject t t))
-    (concat "^Subject: "
+    ;; Some mailers insert extra spaces after "Subject:", so allow any
+    ;; amount of them.
+    (concat "^Subject:[ \t]+"
            (if (string= "\\`" (substring rmail-reply-regexp 0 2))
                (substring rmail-reply-regexp 2)
              rmail-reply-regexp)