From: yamaoka <yamaoka>
Date: Thu, 22 Mar 2001 22:43:49 +0000 (+0000)
Subject: ;; Applied patch from NISHIDA Masakazu <m_nisida@ca2.so-net.ne.jp>.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=14e39219a565f46b0f3309e37ad0b16deb9c5ceb;p=elisp%2Fmu-cite.git

;; Applied patch from NISHIDA Masakazu <m_nisida@ca2.so-net.ne.jp>.
* mu-register.el (mu-cite-get-prefix-register-verbose-method): Support
 X-Cite-Me as well as X-Attribution.
(mu-cite-get-prefix-register-method): Ditto.
* mu-bbdb.el (mu-bbdb-get-prefix-register-verbose-method): Ditto.
(mu-bbdb-get-prefix-register-method): Ditto.
* mu-cite.el (mu-cite-default-methods-alist): Ditto.
---

diff --git a/ChangeLog b/ChangeLog
index 231b98e..e6c7151 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-22  NISHIDA Masakazu  <m_nisida@ca2.so-net.ne.jp>
+
+	* mu-register.el (mu-cite-get-prefix-register-verbose-method):
+	Support X-Cite-Me as well as X-Attribution.
+	(mu-cite-get-prefix-register-method): Ditto.
+	* mu-bbdb.el (mu-bbdb-get-prefix-register-verbose-method): Ditto.
+	(mu-bbdb-get-prefix-register-method): Ditto.
+	* mu-cite.el (mu-cite-default-methods-alist): Ditto.
+
 2001-03-09  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* mu-cite.el (fill-column-for-fill-cited-region): New user option.
diff --git a/NEWS b/NEWS
index f5bb536..0c61246 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Copyright (C) 1999 Free Software Foundation, Inc.
 * Changes in MU-CITE 8.2
 ========================
 
+** MU-CITE now support X-Cite-Me header as well as X-Attribution.
+
 ** New user option `fill-column-for-fill-cited-region' specifies an
 integer value to override `fill-column' while `fill-cited-region' is
 being executed.
diff --git a/mu-bbdb.el b/mu-bbdb.el
index 4efa3cd..4abfd71 100644
--- a/mu-bbdb.el
+++ b/mu-bbdb.el
@@ -84,6 +84,7 @@ instead of call the function directly."
 		(mu-cite-remove-text-properties
 		 (read-string "Citation name? "
 			      (or (mu-cite-get-value 'x-attribution)
+				  (mu-cite-get-value 'x-cite-me)
 				  (mu-cite-get-value 'full-name))
 			      'mu-bbdb-history))))
 	  (if (and (not (string-equal return ""))
@@ -109,6 +110,7 @@ instead of call the function directly."
 		  (read-string "Citation name? "
 			       (or attr
 				   (mu-cite-get-value 'x-attribution)
+				   (mu-cite-get-value 'x-cite-me)
 				   (mu-cite-get-value 'full-name))
 			       'mu-bbdb-history))))
     (if (and (not (string-equal return ""))
diff --git a/mu-cite.el b/mu-cite.el
index d292937..23f3e36 100644
--- a/mu-cite.el
+++ b/mu-cite.el
@@ -148,6 +148,10 @@
 	      (function
 	       (lambda ()
 		 (mu-cite-get-field-value "X-Attribution"))))
+	(cons 'x-cite-me
+	      (function
+	       (lambda ()
+		 (mu-cite-get-field-value "X-Cite-Me"))))
 	;; mu-register
 	(cons 'prefix (function mu-cite-get-prefix-method))
 	(cons 'prefix-register
diff --git a/mu-register.el b/mu-register.el
index 253d7cb..46167de 100644
--- a/mu-register.el
+++ b/mu-register.el
@@ -148,6 +148,7 @@
 		(mu-cite-remove-text-properties
 		 (read-string "Citation name? "
 			      (or (mu-cite-get-value 'x-attribution)
+				  (mu-cite-get-value 'x-cite-me)
 				  (mu-cite-get-value 'full-name))
 			      'mu-register-history))))
 
@@ -166,6 +167,7 @@
 		  (read-string "Citation name? "
 			       (or return1
 				   (mu-cite-get-value 'x-attribution)
+				   (mu-cite-get-value 'x-cite-me)
 				   (mu-cite-get-value 'full-name))
 			       'mu-register-history))))
     (if (and (or mu-cite-allow-null-string-registration