X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=README-gnus-bbdb.ja;h=8e863d9c9fef5a62c9b8d2c2a696197add1404ec;hb=fe436892f6bfe704bde900668d381f18800fdf60;hp=f9f99bf0479ccead1b095c721a6480a2286cd7d2;hpb=2cc5659442ce551b395b9aeebe213947e415ac6d;p=elisp%2Fgnus.git-

diff --git a/README-gnus-bbdb.ja b/README-gnus-bbdb.ja
index f9f99bf..8e863d9 100644
--- a/README-gnus-bbdb.ja
+++ b/README-gnus-bbdb.ja
@@ -43,26 +43,46 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$
 $B0J2<$O(B bbdb.el / bbdb-hooks.el $B$K$"$F$k(B patch $B$G$9!#(B
 
 ------ cut here ------ cut here ------ cut here ------ cut here ------
---- bbdb-hooks.el~	Tue Oct 13 03:13:50 1998
-+++ bbdb-hooks.el	Fri Oct 30 17:05:53 1998
-@@ -352,12 +352,23 @@
- 	(marker (bbdb-header-start))
- 	field pairs fieldval  ; do all bindings here for speed
- 	regexp string notes-field-name notes
--	 replace-p replace-or-add-msg)
-+	replace-p replace-or-add-msg
-+	extract-field-value-funtion)
+--- bbdb-2.33/lisp/bbdb-com.el~	Sat Sep  1 07:00:10 2001
++++ bbdb-2.33/lisp/bbdb-com.el	Mon Sep 10 23:17:46 2001
+@@ -1654,7 +1654,7 @@
+           ;; to be enclosed in quotes.  Double-quotes and backslashes have
+           ;; already been escaped.  This quotes a few extra characters as
+           ;; well (!,%, and $) just for common sense.
+-          ((string-match "[][\000-\037\177()<>@,;:.!$%]" name)
++	  ((string-match "[][\000-\037\177<>@,;.!$%]" name)
+            (format "\"%s\" <%s>" name net))
+           (t
+            (format "%s <%s>" name net)))))
+--- bbdb-2.33/lisp/bbdb-hooks.el~	Sat Sep  1 07:00:10 2001
++++ bbdb-2.33/lisp/bbdb-hooks.el	Mon Sep 10 23:17:46 2001
+@@ -35,6 +35,8 @@
+ ;; $Id: README-gnus-bbdb.ja,v 1.1.2.5.10.6 2001-09-10 23:21:07 yamaoka Exp $
+ ;;
+ 
++(eval-when-compile (require 'cl))
++
+ (require 'bbdb)
+ 
+ (defvar rmail-buffer)
+@@ -384,13 +386,23 @@
+          (marker (bbdb-header-start))
+          field pairs fieldval  ; do all bindings here for speed
+          regexp string notes-field-name notes
+-         replace-p)
++         replace-p extract-field-value-funtion)
      (set-buffer (marker-buffer marker))
      (save-restriction
 -      (widen)
 -      (goto-char marker)
 -      (if (and (setq fieldval (bbdb-extract-field-value "From"))
+-               (string-match (bbdb-user-mail-names) fieldval))
 +      (let ((function-list bbdb-extract-field-value-function-list)
 +	    function)
 +	(or (progn
 +	      (while (and (not extract-field-value-funtion)
 +			  (setq function (car function-list)))
-+		(setq extract-field-value-funtion (funcall function)))
++		(setq extract-field-value-funtion (funcall function)
 +		      function-list (cdr function-list)))
 +	      extract-field-value-funtion)
 +	    (progn
@@ -70,33 +90,35 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$
 +	      (goto-char marker)
 +	      (setq extract-field-value-funtion 'bbdb-extract-field-value))))
 +      (if (and (setq fieldval (funcall extract-field-value-funtion "From"))
- 	       (string-match (bbdb-user-mail-names) fieldval))
- 	  ;; Don't do anything if this message is from us.  Note that we have
- 	  ;; to look at the message instead of the record, because the record
-@@ -368,7 +378,7 @@
- 	  (goto-char marker)
- 	  (setq field (car (car ignore-all))
- 		regexp (cdr (car ignore-all))
--		fieldval (bbdb-extract-field-value field))
-+		fieldval (funcall extract-field-value-funtion field))
- 	  (if (and fieldval
- 		   (string-match regexp fieldval))
- 	      (setq ignore t)
-@@ -382,7 +392,7 @@
- 		pairs (cdr (car rest))	; (REGEXP . STRING) or
- 					; (REGEXP FIELD-NAME STRING) or
- 					; (REGEXP FIELD-NAME STRING REPLACE-P)
--		fieldval (bbdb-extract-field-value field)) ; e.g., Subject line
-+		fieldval (funcall extract-field-value-funtion field)) ; e.g., Subject line
- 	  (if fieldval
- 	      (while pairs
- 		(setq regexp (car (car pairs))
---- bbdb.el~	Tue Oct 13 03:14:55 1998
-+++ bbdb.el	Fri Oct 30 17:05:53 1998
-@@ -620,6 +620,7 @@
++	       (string-match (bbdb-user-mail-names) fieldval))
+           ;; Don't do anything if this message is from us.  Note that we have
+           ;; to look at the message instead of the record, because the record
+           ;; will be of the recipient of the message if it is from us.
+@@ -400,7 +412,7 @@
+           (goto-char marker)
+           (setq field (car (car ignore-all))
+                 regexp (cdr (car ignore-all))
+-                fieldval (bbdb-extract-field-value field))
++                fieldval (funcall extract-field-value-funtion field))
+           (if (and fieldval
+                    (string-match regexp fieldval))
+               (setq ignore t)
+@@ -413,7 +425,8 @@
+                 pairs (cdr (car rest))  ; (REGEXP . STRING) or
+                                         ; (REGEXP FIELD-NAME STRING) or
+                                         ; (REGEXP FIELD-NAME STRING REPLACE-P)
+-                fieldval (bbdb-extract-field-value field)) ; e.g., Subject line
++                fieldval (funcall extract-field-value-funtion field))
++                                        ; e.g., Subject line
+           (when fieldval
+             (while pairs
+               (setq regexp (car (car pairs))
+--- bbdb-2.33/lisp/bbdb.el~	Wed Sep  5 07:00:12 2001
++++ bbdb-2.33/lisp/bbdb.el	Mon Sep 10 23:17:46 2001
+@@ -707,6 +707,7 @@
  (defvar bbdb-showing-changed-ones nil)
  (defvar bbdb-modified-p nil)
- (defvar bbdb-elided-display nil)
+ (defvar bbdb-address-print-formatting-alist) ; "bbdb-print"
 +(defvar bbdb-extract-field-value-function-list nil)
  
  (defvar bbdb-debug t)