From d049f56999dcaa62e5c5fca25ff00644b1629c53 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 15 Aug 2002 10:56:10 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog    |    7 +++++++
 lisp/gnus-art.el  |   13 ++++++++-----
 lisp/message.el   |    6 +++---
 texi/ChangeLog    |    5 +++++
 texi/gnus-ja.texi |    8 ++++++--
 texi/gnus.texi    |   11 +++++++----
 6 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 588487e..3914447 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-15  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* gnus-art.el (article-make-date-line): Refer to the value for
+	`gnus-article-time-format' in the summary buffer.
+
+	* message.el (message-cite-prefix-regexp): Exclude ":" and ",A;(B".
+
 2002-08-14  Simon Josefsson  <jas@extundo.com>
 
 	* gnus-art.el (gnus-button-alist): Use ' not ` for default value
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 9fff9e2..bb35f32 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2754,11 +2754,14 @@ should replace the \"Date:\" one, or should be added below it."
 			     date)))
 	 ;; Let the user define the format.
 	 ((eq type 'user)
-	  (if (gnus-functionp gnus-article-time-format)
-	      (funcall gnus-article-time-format time)
-	    (concat
-	     "Date: "
-	     (format-time-string gnus-article-time-format time))))
+	  (let ((format (or (condition-case nil
+				(with-current-buffer gnus-summary-buffer
+				  gnus-article-time-format)
+			      (error nil))
+			    gnus-article-time-format)))
+	    (if (gnus-functionp format)
+		(funcall format time)
+	      (concat "Date: " (format-time-string format time)))))
 	 ;; ISO 8601.
 	 ((eq type 'iso8601)
 	  (let ((tz (car (current-time-zone time))))
diff --git a/lisp/message.el b/lisp/message.el
index 42d8616..8e9e032 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -485,7 +485,7 @@ The provided functions are:
 
 (defcustom message-cite-prefix-regexp
   (if (string-match "[[:digit:]]" "1") ;; support POSIX?
-      "\\([ \t]*[-_.[:word:]]+>+\\|[ \t]*[]>»|:}+]\\)+"
+      "\\([ \t]*[-_.[:word:]]+>+\\|[ \t]*[]>|}+]\\)+"
     ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
     (let ((old-table (syntax-table))
 	  non-word-constituents)
@@ -497,10 +497,10 @@ The provided functions are:
 	     (if (string-match "\\w" ".")  "" ".")))
       (set-syntax-table old-table)
       (if (equal non-word-constituents "")
-	  "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>»|:}+]\\)+"
+	  "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}+]\\)+"
 	(concat "\\([ \t]*\\(\\w\\|["
 		non-word-constituents
-		"]\\)+>+\\|[ \t]*[]>»|:}+]\\)+"))))
+		"]\\)+>+\\|[ \t]*[]>|}+]\\)+"))))
   "*Regexp matching the longest possible citation prefix on a line."
   :group 'message-insertion
   :type 'regexp)
diff --git a/texi/ChangeLog b/texi/ChangeLog
index def6da6..943cc13 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-15  Jesper harder  <harder@ifa.au.dk>
+
+	* gnus.texi (Group Line Specification): Add %C.
+	(Group Parameters): Comments can be displayed in the group line.
+
 2002-08-07  Jesper harder  <harder@ifa.au.dk>
 
 	* emacs-mime.texi (Non-MIME): Add yenc.
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index d8234ad..4c9b4fc 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1925,6 +1925,10 @@ gnus $B$,$3$N?dDj$r;H$&$N$O!"(B@sc{nntp} $B%W%m%H%3%k$OG=N($NNI(B
 @item G
 $B%0%k!<%WL>!#(B
 
+@item C
+$B%0%k!<%W%Q%i%a!<%?$K%3%a%s%H$NMWAG$,L5$$>l9g$N%3%a%s(B
+$B%H(B (@pxref{Group Parameters}) $B$^$?$O%0%k!<%WL>!#(B
+
 @item D
 $B%K%e!<%9%0%k!<%W$N@bL@!#(B
 
@@ -2936,8 +2940,8 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @item comment
 @cindex comment
 @code{(comment . "This is a comment")} $B$N$h$&$JMWAG$O!"$=$N%0%k!<%W$KBP(B
-$B$9$kG$0U$N%3%a%s%H$G$9!#$3$l$O8=:_$N(B gnus $B$G$OL5;k$5$l$^$9$,!"FCDj$N%0%k!<(B
-$B%W$KBP$9$k>pJs$r3JG<$9$k>l=j$rDs6!$7$^$9!#(B
+$B$9$kG$0U$N%3%a%s%H$G$9!#%0%k!<%W9T$KI=<($9$k$3$H$,$G$-$^(B
+$B$9(B (@pxref{Group Line Specification})$B!#(B
 
 @ignore
 @item charset
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 818500e..1501c48 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1796,6 +1796,10 @@ Full group name.
 @item G
 Group name.
 
+@item C
+Group comment (@pxref{Group Parameters}) or group name if there is no
+comment element in the group parameters.
+
 @item D
 Newsgroup description.
 
@@ -2841,10 +2845,9 @@ command (@pxref{Limiting}).
 
 @item comment
 @cindex comment
-Elements that look like @code{(comment . "This is a comment")}
-are arbitrary comments on the group.  They are currently ignored by
-gnus, but provide a place for you to store information on particular
-groups.
+Elements that look like @code{(comment . "This is a comment")} are
+arbitrary comments on the group.  You can display comments in the
+group line (@pxref{Group Line Specification}).
 
 @item charset
 @cindex charset
-- 
1.7.10.4