Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5d9193..ce1d65e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-15 18:09  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-mode-syntax-table): Add - as a word
+       constituent as in articles.
+       (message-setup-fill-variables): Add -_. as supercite-style prefix.
+       * gnus-art.el (gnus-article-mode-syntax-table): Remove ?-.
+
 2000-11-15 13:21  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-msg.el (gnus-inews-do-gcc): Expire the article.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 89fc99f..df6463c 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1087,7 +1087,8 @@ It is a string, such as \"PGP\". If nil, ask user."
 
 (defvar gnus-article-mode-syntax-table
   (let ((table (copy-syntax-table text-mode-syntax-table)))
-    (modify-syntax-entry ?- "w" table)
+    ;; This causes the citation match run O(2^n).
+    ;; (modify-syntax-entry ?- "w" table) 
     (modify-syntax-entry ?> ")" table)
     (modify-syntax-entry ?< "(" table)
     table)

diff --git a/lisp/message.el b/lisp/message.el
index cd223db..124c154 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -437,7 +437,8 @@ The provided functions are:
   :type 'regexp)
 
 (defcustom message-cite-prefix-regexp
-  "[ \t]*\\(\\(\\w\\|[_-\\.]\\)+>+[ \t]*\\|[]>»|:}+ ]*[]>»|:}+][ \t]*\\)+"
+  ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
+  "[ \t]*\\(\\(\\w\\|[-_.]\\)+>+[ \t]*\\|[]>»|:}+][ \t]*\\)+"
   "*Regexp matching the longest possible citation prefix on a line."
   :group 'message-insertion
   :type 'regexp)
@@ -1906,7 +1907,7 @@ M-RET    message-newline-and-reformat (break the line and reformat)."
         (concat
          "[ \t]*"                      ; possible initial space
          "\\(\\(" (regexp-quote message-yank-prefix) "\\|" ; user's prefix
-         "\\w+>\\|"                    ; supercite-style prefix
+         "\\(\\w\\|[-_.]\\)+>\\|"      ; supercite-style prefix
          "[|:>]"                       ; standard prefix
          "\\)[ \t]*\\)+")))            ; possible space after each prefix
     (setq paragraph-start