message.el (message-subject-trailing-was-ask-regexp, message-subject-trailing-was...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 01c2e3529137a0c88914eed24be54c94f0c639cd..f23809fa42e5e7ba74d129dba210d3e147d0ee76 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-09  Sven Joachim  <svenjoac@gmx.de>
+
+       * message.el (message-subject-trailing-was-ask-regexp)
+       (message-subject-trailing-was-regexp): Match was: in addition to was.
+
 2010-11-09  Glenn Morris  <rgm@gnu.org>
 
        * nnbabyl.el (nnbabyl-request-move-article, nnbabyl-delete-mail)

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 42f67035c136899ddf052b5f6855270cf23525c6..c305a18bd21fcd293b44950512a1667a8032dc4c 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -322,7 +322,7 @@ used."
   :group 'message-various)
 
 (defcustom message-subject-trailing-was-ask-regexp
-  "[ \t]*\\([[(]+[Ww][Aa][Ss][ \t]*.*[\])]+\\)"
+  "[ \t]*\\([[(]+[Ww][Aa][Ss]:?[ \t]*.*[\])]+\\)"
   "*Regexp matching \"(was: <old subject>)\" in the subject line.
 
 The function `message-strip-subject-trailing-was' uses this regexp if
@@ -331,13 +331,13 @@ the variable is t instead of `ask', use
 `message-subject-trailing-was-regexp' instead.
 
 It is okay to create some false positives here, as the user is asked."
-  :version "22.1"
+  :version "24.1"
   :group 'message-various
   :link '(custom-manual "(message)Message Headers")
   :type 'regexp)
 
 (defcustom message-subject-trailing-was-regexp
-  "[ \t]*\\((*[Ww][Aa][Ss][ \t]*.*)\\)"
+  "[ \t]*\\((*[Ww][Aa][Ss]:?[ \t]*.*)\\)"
   "*Regexp matching \"(was: <old subject>)\" in the subject line.
 
 If `message-subject-trailing-was-query' is set to t, the subject is