* wl-summary.el (wl-summary-delete-cache): Fixed.

[elisp/wanderlust.git] / utils / bbdb-wl.el

diff --git a/utils/bbdb-wl.el b/utils/bbdb-wl.el
index db4cfc4..b6f0c7d 100644 (file)
--- a/utils/bbdb-wl.el
+++ b/utils/bbdb-wl.el
@@ -31,6 +31,7 @@
 (require 'bbdb)
 
 (defvar bbdb-wl-get-update-record-hook nil)
+(defvar bbdb-wl-folder-regexp nil)
 
 (defun bbdb-wl-setup ()
   (add-hook 'wl-message-redisplay-hook 'bbdb-wl-get-update-record)
@@ -63,9 +64,15 @@
   (bbdb-save-db t))
 
 (defun bbdb-wl-get-update-record ()
-  (set-buffer (wl-message-get-original-buffer))
-  (bbdb-wl-update-record)
-  (run-hooks 'bbdb-wl-get-update-record-hook))
+  (if (or (null bbdb-wl-folder-regexp)
+         (string-match
+          bbdb-wl-folder-regexp
+          (with-current-buffer
+              wl-message-buffer-cur-summary-buffer
+            (wl-summary-buffer-folder-name))))
+      (with-current-buffer (wl-message-get-original-buffer)
+       (bbdb-wl-update-record)
+       (run-hooks 'bbdb-wl-get-update-record-hook))))
 
 (defun bbdb-wl-hide-bbdb-buffer ()
   (let (bbdb-buf bbdb-win)
@@ -81,7 +88,7 @@
                      (save-excursion
                        (if (buffer-live-p  wl-current-summary-buffer)
                            (set-buffer wl-current-summary-buffer))
-                       wl-message-buf-name)))
+                       wl-message-buffer)))
            (cur-win (selected-window))
            (b (current-buffer)))
        (and mes-win (select-window mes-win))
@@ -190,7 +197,7 @@ the user confirms the creation."
                (save-excursion
                  (if (buffer-live-p wl-current-summary-buffer)
                      (set-buffer wl-current-summary-buffer))
-                 wl-message-buf-name))
+                 wl-message-buffer))
               (intern (format
                        "%s-%d"
                        wl-current-summary-buffer
@@ -316,7 +323,7 @@ displaying the record corresponding to the sender of the current message."
                    (save-excursion
                      (if (buffer-live-p  wl-current-summary-buffer)
                          (set-buffer wl-current-summary-buffer))
-                     wl-message-buf-name)))
+                     wl-message-buffer)))
          (cur-win (selected-window))
          (b (current-buffer)))
       (and mes-win