message.el (message-cite-prefix-regexp): Fix wrong change I did when merging Gnus...

diff --git a/lisp/message.el b/lisp/message.el
index 9e79e3e..40c4577 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -622,21 +622,27 @@ Done before generating the new subject of a forward."
   :type 'regexp)
 
 (defcustom message-cite-prefix-regexp
-  (if (string-match "[[:digit:]]" "1")
-      ;; Support POSIX?  XEmacs 21.5.27 doesn't.
-      "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|]\\)+"
-    ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
-    (let (non-word-constituents)
-      (with-syntax-table text-mode-syntax-table
-       (setq non-word-constituents
-             (concat
-              (if (string-match "\\w" "_")  "" "_")
-              (if (string-match "\\w" ".")  "" "."))))
-      (if (equal non-word-constituents "")
-         "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|]\\)+"
-       (concat "\\([ \t]*\\(\\w\\|["
-               non-word-constituents
-               "]\\)+>+\\|[ \t]*[]>|]\\)+"))))
+  ;; Default to the value of `mail-citation-prefix-regexp' if available.
+  ;; Note: as for XEmacs 21.4 and 21.5, it is unavailable unless sendmail.el
+  ;; is loaded.
+  (cond ((boundp 'mail-citation-prefix-regexp)
+        mail-citation-prefix-regexp)
+       ((string-match "[[:digit:]]" "1")
+        ;; Support POSIX?  XEmacs 21.5.27 doesn't.
+        "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+")
+       (t
+        ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
+        (let (non-word-constituents)
+          (with-syntax-table text-mode-syntax-table
+            (setq non-word-constituents
+                  (concat
+                   (if (string-match "\\w" "_")  "" "_")
+                   (if (string-match "\\w" ".")  "" "."))))
+          (if (equal non-word-constituents "")
+              "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}]\\)+"
+            (concat "\\([ \t]*\\(\\w\\|["
+                    non-word-constituents
+                    "]\\)+>+\\|[ \t]*[]>|}]\\)+")))))
   "*Regexp matching the longest possible citation prefix on a line."
   :version "24.1"
   :group 'message-insertion