(message-cite-prefix-regexp): Revert my last edit.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69f68fc..aa3faf1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

+       * message.el (message-cite-prefix-regexp): Revert my last edit.
+

        * gnus-sum.el (gnus-summary-show-complete-article): Bind the server
        variable instead of the Gnus variable.
 
        * gnus-sum.el (gnus-summary-show-complete-article): Bind the server
        variable instead of the Gnus variable.
 

diff --git a/lisp/message.el b/lisp/message.el
index d5702b5..40c4577 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -629,7 +629,7 @@ Done before generating the new subject of a forward."
         mail-citation-prefix-regexp)
        ((string-match "[[:digit:]]" "1")
         ;; Support POSIX?  XEmacs 21.5.27 doesn't.
         mail-citation-prefix-regexp)
        ((string-match "[[:digit:]]" "1")
         ;; Support POSIX?  XEmacs 21.5.27 doesn't.

-        "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|]\\)+")
+        "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+")

        (t
         ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
         (let (non-word-constituents)
        (t
         ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
         (let (non-word-constituents)


@@ -639,10 +639,10 @@ Done before generating the new subject of a forward."
                    (if (string-match "\\w" "_")  "" "_")
                    (if (string-match "\\w" ".")  "" "."))))
           (if (equal non-word-constituents "")
                    (if (string-match "\\w" "_")  "" "_")
                    (if (string-match "\\w" ".")  "" "."))))
           (if (equal non-word-constituents "")

-              "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|]\\)+"
+              "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}]\\)+"

             (concat "\\([ \t]*\\(\\w\\|["
                     non-word-constituents
             (concat "\\([ \t]*\\(\\w\\|["
                     non-word-constituents

-                    "]\\)+>+\\|[ \t]*[]>|]\\)+")))))
+                    "]\\)+>+\\|[ \t]*[]>|}]\\)+")))))

   "*Regexp matching the longest possible citation prefix on a line."
   :version "24.1"
   :group 'message-insertion
   "*Regexp matching the longest possible citation prefix on a line."
   :version "24.1"
   :group 'message-insertion