[Emacs-diffs] /srv/bzr/emacs/trunk r102296: message.el (message-subject-trailing-was-ask-regexp, message-subject-trailing-was-regexp): Match was: in addition to was.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102296
author: Sven Joachim <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-09 10:29:37 +0000
message:
  message.el (message-subject-trailing-was-ask-regexp, 
message-subject-trailing-was-regexp): Match was: in addition to was.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-09 05:33:07 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-09 10:29:37 +0000
@@ -1,3 +1,8 @@
+2010-11-09  Sven Joachim  <address@hidden>
+
+       * message.el (message-subject-trailing-was-ask-regexp)
+       (message-subject-trailing-was-regexp): Match was: in addition to was.
+
 2010-11-09  Glenn Morris  <address@hidden>
 
        * nnbabyl.el (nnbabyl-request-move-article, nnbabyl-delete-mail)

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-11-09 02:00:56 +0000
+++ b/lisp/gnus/message.el      2010-11-09 10:29:37 +0000
@@ -322,7 +322,7 @@
   :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 @@
 `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