Synch with Gnus.

[elisp/gnus.git-] / README-gnus-bbdb.en

diff --git a/README-gnus-bbdb.en b/README-gnus-bbdb.en
index 6b7f322..287636e 100644 (file)
--- a/README-gnus-bbdb.en
+++ b/README-gnus-bbdb.en
@@ -1,8 +1,5 @@
 -*- mode: text; fill-column: 70; -*-
 
 -*- mode: text; fill-column: 70; -*-
 

-  **  This document is copied from keiichi branch. **
-  **  We thank Keiichi Suzuki a lot.               **
-

 ---
  If BBDB is used then, bbdb-gnus.elc can't be shared with them before
 Semi-gnus 6.8.X. It is necessary to byte-compile it again.
 ---
  If BBDB is used then, bbdb-gnus.elc can't be shared with them before
 Semi-gnus 6.8.X. It is necessary to byte-compile it again.

@@ -13,11 +10,10 @@ Semi-gnus 6.8.X. It is necessary to byte-compile it again.
 ---
 gnus-bbdb.el
 
 ---
 gnus-bbdb.el
 

- This is the BBDB API module for Semi-gnus, which includes Chao-gnus
-6.9. `mime-bbdb' should not be necessary for Semi-gnus, if that module
-were used.
+ This is the BBDB API module for Semi-gnus. `mime-bbdb' should not be
+necessary for Semi-gnus, if that module were used.

 
 

- You need FLIM after 1.11.3.
+ You need FLIM 1.11.3 or later.

 
  If you are using bbdb-auto-notes-hook, the patch listed at the end
 of this file should be applied. If not, it might not.
 
  If you are using bbdb-auto-notes-hook, the patch listed at the end
 of this file should be applied. If not, it might not.

@@ -32,12 +28,13 @@ of this file should be applied. If not, it might not.
 (require 'gnus-bbdb)
 (bbdb-initialize 'sc)  ;; 'Gnus or 'gnus should be deleted.
 (add-hook 'gnus-startup-hook 'gnus-bbdb-insinuate)
 (require 'gnus-bbdb)
 (bbdb-initialize 'sc)  ;; 'Gnus or 'gnus should be deleted.
 (add-hook 'gnus-startup-hook 'gnus-bbdb-insinuate)

+(add-hook 'message-setup-hook 'gnus-bbdb-insinuate-message)

 
  If you would like to decode the quoted encoded words forcibly, even
 though FLIM does not decode them, put the following lines in your
 .gnus file.
 
 
  If you would like to decode the quoted encoded words forcibly, even
 though FLIM does not decode them, put the following lines in your
 .gnus file.
 

-(setq gnus-bbeb/decode-field-body-function
+(setq gnus-bbdb/decode-field-body-function

       (function
        (lambda (field-body field-name)
          (eword-decode-string field-body))))
       (function
        (lambda (field-body field-name)
          (eword-decode-string field-body))))

@@ -48,7 +45,7 @@ though FLIM does not decode them, put the following lines in your
 ------ 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
 ------ 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,22 @@
+@@ -352,12 +352,23 @@

        (marker (bbdb-header-start))
        field pairs fieldval  ; do all bindings here for speed
        regexp string notes-field-name notes
        (marker (bbdb-header-start))
        field pairs fieldval  ; do all bindings here for speed
        regexp string notes-field-name notes

@@ -64,8 +61,9 @@ though FLIM does not decode them, put the following lines in your
 +          function)
 +      (or (progn
 +            (while (and (not extract-field-value-funtion)
 +          function)
 +      (or (progn
 +            (while (and (not extract-field-value-funtion)

-+                        (setq function (pop function-list)))
++                        (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
 +            (widen)
 +            extract-field-value-funtion)
 +          (progn
 +            (widen)