From 16b2abc2d00c0b4cb703e84b72a6f23e9c9ffe70 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 10 Sep 2001 23:20:58 +0000 Subject: [PATCH] Oops, fix again. --- README-gnus-bbdb.en | 36 +++++++++++++++++------------------- README-gnus-bbdb.ja | 36 +++++++++++++++++------------------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/README-gnus-bbdb.en b/README-gnus-bbdb.en index 470f9ee..49945ee 100644 --- a/README-gnus-bbdb.en +++ b/README-gnus-bbdb.en @@ -43,9 +43,9 @@ though FLIM does not decode them, put the following lines in your This is a patch for bbdb.el / bbdb-hooks.el. ------ cut here ------ cut here ------ cut here ------ cut here ------ ---- bbdb-2.33/lisp/bbdb-com.el~ Sat Mar 24 08:00:29 2001 -+++ bbdb-2.33/lisp/bbdb-com.el Mon Sep 10 22:48:15 2001 -@@ -1625,7 +1625,7 @@ +--- 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. @@ -54,30 +54,29 @@ though FLIM does not decode them, put the following lines in your (format "\"%s\" <%s>" name net)) (t (format "%s <%s>" name net))))) ---- bbdb-2.33/lisp/bbdb-hooks.el~ Tue Mar 20 08:00:09 2001 -+++ bbdb-2.33/lisp/bbdb-hooks.el Mon Sep 10 22:48:15 2001 +--- 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.en,v 1.1.2.6.2.2 2001-09-10 22:51:43 yamaoka Exp $ + ;; $Id: README-gnus-bbdb.en,v 1.1.2.6.2.3 2001-09-10 23:20:58 yamaoka Exp $ ;; +(eval-when-compile (require 'cl)) + (require 'bbdb) - (defmacro the-v18-byte-compiler-sucks-wet-farts-from-dead-pigeons () -@@ -367,14 +369,24 @@ + (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-or-add-msg) -+ replace-p replace-or-add-msg extract-field-value-funtion) +- 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)) -- ;; Don't do anything if this message is from us. Note that we have + (let ((function-list bbdb-extract-field-value-function-list) + function) + (or (progn @@ -92,11 +91,10 @@ though FLIM does not decode them, put the following lines in your + (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 + ;; 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. - nil -@@ -383,7 +395,7 @@ +@@ -400,7 +412,7 @@ (goto-char marker) (setq field (car (car ignore-all)) regexp (cdr (car ignore-all)) @@ -105,7 +103,7 @@ though FLIM does not decode them, put the following lines in your (if (and fieldval (string-match regexp fieldval)) (setq ignore t) -@@ -396,7 +408,8 @@ +@@ -413,7 +425,8 @@ pairs (cdr (car rest)) ; (REGEXP . STRING) or ; (REGEXP FIELD-NAME STRING) or ; (REGEXP FIELD-NAME STRING REPLACE-P) @@ -115,12 +113,12 @@ though FLIM does not decode them, put the following lines in your (when fieldval (while pairs (setq regexp (car (car pairs)) ---- bbdb-2.33/lisp/bbdb.el~ Tue Mar 27 08:00:31 2001 -+++ bbdb-2.33/lisp/bbdb.el Mon Sep 10 22:48:15 2001 -@@ -709,6 +709,7 @@ +--- 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) diff --git a/README-gnus-bbdb.ja b/README-gnus-bbdb.ja index 3beabb0..de37573 100644 --- a/README-gnus-bbdb.ja +++ b/README-gnus-bbdb.ja @@ -43,9 +43,9 @@ 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-2.33/lisp/bbdb-com.el~ Sat Mar 24 08:00:29 2001 -+++ bbdb-2.33/lisp/bbdb-com.el Mon Sep 10 22:48:15 2001 -@@ -1625,7 +1625,7 @@ +--- 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. @@ -54,30 +54,29 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$ (format "\"%s\" <%s>" name net)) (t (format "%s <%s>" name net))))) ---- bbdb-2.33/lisp/bbdb-hooks.el~ Tue Mar 20 08:00:09 2001 -+++ bbdb-2.33/lisp/bbdb-hooks.el Mon Sep 10 22:48:15 2001 +--- 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.6.2.2 2001-09-10 22:51:44 yamaoka Exp $ + ;; $Id: README-gnus-bbdb.ja,v 1.1.2.6.2.3 2001-09-10 23:20:58 yamaoka Exp $ ;; +(eval-when-compile (require 'cl)) + (require 'bbdb) - (defmacro the-v18-byte-compiler-sucks-wet-farts-from-dead-pigeons () -@@ -367,14 +369,24 @@ + (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-or-add-msg) -+ replace-p replace-or-add-msg extract-field-value-funtion) +- 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)) -- ;; Don't do anything if this message is from us. Note that we have + (let ((function-list bbdb-extract-field-value-function-list) + function) + (or (progn @@ -92,11 +91,10 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$ + (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 + ;; 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. - nil -@@ -383,7 +395,7 @@ +@@ -400,7 +412,7 @@ (goto-char marker) (setq field (car (car ignore-all)) regexp (cdr (car ignore-all)) @@ -105,7 +103,7 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$ (if (and fieldval (string-match regexp fieldval)) (setq ignore t) -@@ -396,7 +408,8 @@ +@@ -413,7 +425,8 @@ pairs (cdr (car rest)) ; (REGEXP . STRING) or ; (REGEXP FIELD-NAME STRING) or ; (REGEXP FIELD-NAME STRING REPLACE-P) @@ -115,12 +113,12 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$ (when fieldval (while pairs (setq regexp (car (car pairs)) ---- bbdb-2.33/lisp/bbdb.el~ Tue Mar 27 08:00:31 2001 -+++ bbdb-2.33/lisp/bbdb.el Mon Sep 10 22:48:15 2001 -@@ -709,6 +709,7 @@ +--- 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) -- 1.7.10.4