From 382a227e7193bb1afa08e7a07fbf692080f2dca7 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 6 Oct 2000 13:22:52 +0000
Subject: [PATCH] Sync with Gnus.

---
 lisp/ChangeLog  |    9 +++++++++
 lisp/message.el |   56 +++++++++++++++++++++++++++++++------------------------
 lisp/webmail.el |    2 +-
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 854c4d3..796198d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-06 08:56:33  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* webmail.el (webmail-type-definition): Fix my-deja open url.
+
+2000-10-06 Emerick Rogul <emerick@csa.bu.edu>
+
+	* message.el (message-setup-fill-variables): New variable.
+	(message-mode): Use it.
+
 2000-10-05  Dave Love  <fx@gnu.org>
 
 	* rfc2047.el (rfc2047-fold-region): Use gnus-point-at-bol.
diff --git a/lisp/message.el b/lisp/message.el
index a83409f..0610610 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1841,20 +1841,6 @@ M-RET    message-newline-and-reformat (break the line and reformat)."
 	      (error "Face %s not configured for %s mode" face mode-name)))
 	  "")
 	facemenu-remove-face-function t)
-  (make-local-variable 'paragraph-separate)
-  (make-local-variable 'paragraph-start)
-  ;; `-- ' precedes the signature.  `-----' appears at the start of the
-  ;; lines that delimit forwarded messages.
-  ;; Lines containing just >= 3 dashes, perhaps after whitespace,
-  ;; are also sometimes used and should be separators.
-  (setq paragraph-start
-	(concat (regexp-quote mail-header-separator)
-		"$\\|[ \t]*[a-z0-9A-Z]*>+[ \t]*$\\|[ \t]*$\\|"
-		"-- $\\|---+$\\|"
-		page-delimiter
-		;;!!! Uhm... shurely this can't be right?
-		"[> " (regexp-quote message-yank-prefix) "]+$"))
-  (setq paragraph-separate paragraph-start)
   (make-local-variable 'message-reply-headers)
   (setq message-reply-headers nil)
   (make-local-variable 'message-user-agent)
@@ -1864,6 +1850,7 @@ M-RET    message-newline-and-reformat (break the line and reformat)."
   (make-local-variable 'message-parameter-alist)
   (setq message-parameter-alist
 	(copy-sequence message-startup-parameter-alist))
+  (message-setup-fill-variables)
   ;;(when (fboundp 'mail-hist-define-keys)
   ;;  (mail-hist-define-keys))
   (if (featurep 'xemacs)
@@ -1883,21 +1870,42 @@ M-RET    message-newline-and-reformat (break the line and reformat)."
 	(mail-abbrevs-setup)
       (mail-aliases-setup)))
   (message-set-auto-save-file-name)
+  (make-local-variable 'indent-tabs-mode) ;Turn off tabs for indentation.
+  (setq indent-tabs-mode nil)
+  (run-hooks 'text-mode-hook 'message-mode-hook))
+
+(defun message-setup-fill-variables ()
+  "Setup message fill variables."
+  (make-local-variable 'paragraph-separate)
+  (make-local-variable 'paragraph-start)
   (make-local-variable 'adaptive-fill-regexp)
-  (setq adaptive-fill-regexp
-	(concat "[ \t]*[-a-z0-9A-Z]*\\(>[ \t]*\\)+[ \t]*\\|"
-		adaptive-fill-regexp))
   (unless (boundp 'adaptive-fill-first-line-regexp)
     (setq adaptive-fill-first-line-regexp nil))
   (make-local-variable 'adaptive-fill-first-line-regexp)
-  (setq adaptive-fill-first-line-regexp
-	(concat "[ \t]*[-a-z0-9A-Z]*\\(>[ \t]*\\)+[ \t]*\\|"
-		adaptive-fill-first-line-regexp))
   (make-local-variable 'auto-fill-inhibit-regexp)
-  (setq auto-fill-inhibit-regexp "^[A-Z][^: \n\t]+:")
-  (make-local-variable 'indent-tabs-mode) ;Turn off tabs for indentation.
-  (setq indent-tabs-mode nil)
-  (run-hooks 'text-mode-hook 'message-mode-hook))
+  (let ((quote-prefix-regexp
+	 (concat
+	  "[ \t]*"                      ; possible initial space
+	  "\\(\\(" (regexp-quote message-yank-prefix) "\\|" ; user's prefix
+	  "\\w+>\\|"                    ; supercite-style prefix
+	  "[|:>]"                       ; standard prefix
+	  "\\)[ \t]*\\)+")))            ; possible space after each prefix
+    (setq paragraph-start
+	  (concat
+	   (regexp-quote mail-header-separator) "$\\|"
+	   "[ \t]*$\\|"                 ; blank lines
+	   "-- $\\|"                    ; signature delimiter
+	   "---+$\\|"                   ; delimiters for forwarded messages
+	   page-delimiter "$\\|"        ; spoiler warnings
+	   ".*wrote:$\\|"               ; attribution lines
+	   quote-prefix-regexp "$"))    ; empty lines in quoted text
+    (setq paragraph-separate paragraph-start)
+    (setq adaptive-fill-regexp
+	  (concat quote-prefix-regexp "\\|" adaptive-fill-regexp))
+    (setq adaptive-fill-first-line-regexp
+	  (concat quote-prefix-regexp "\\|"
+		  adaptive-fill-first-line-regexp))
+    (setq auto-fill-inhibit-regexp "^[A-Z][^: \n\t]+:")))
 
 
 
diff --git a/lisp/webmail.el b/lisp/webmail.el
index d8dcc14..bac7664 100644
--- a/lisp/webmail.el
+++ b/lisp/webmail.el
@@ -144,7 +144,7 @@
     (my-deja
      (paranoid cookie post)
      (address . "www.my-deja.com")
-     (open-url "http://www.my-deja.com/")
+     (open-url "http://www.deja.com/my/pr.xp")
      (open-snarf . webmail-my-deja-open)
      (login-url
       content 
-- 
1.7.10.4