Fix last change.

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

diff --git a/utils/bbdb-wl.el b/utils/bbdb-wl.el
index e225495..b40e4c2 100644 (file)
--- a/utils/bbdb-wl.el
+++ b/utils/bbdb-wl.el
@@ -38,8 +38,10 @@
   "Way to canonicalize full name.")
 
 (defun bbdb-wl-canonicalize-spaces-and-dots (string)
-  (while (string-match "  +\\|[\f\t\n\r\v]+\\|\\." string)
+  (while (and string (string-match "  +\\|[\f\t\n\r\v]+\\|\\." string))
     (setq string (replace-match " " nil t string)))
+  (and string (string-match "^ " string)
+       (setq string (replace-match "" nil t string)))
   string)
 
 ;;;###autoload
@@ -177,8 +179,7 @@ For BBDB 2.33 or earlier."
                              (std11-unfold-string header)))
            (while (and (setq structure (car structures))
                        (eq (car structure) 'mailbox))
-             (setq fn (funcall bbdb-wl-canonicalize-full-name-function
-                               (std11-full-name-string structure))
+             (setq fn (std11-full-name-string structure)
                    fn (and fn
                            (with-temp-buffer ; to keep raw buffer unibyte.
                              (elmo-set-buffer-multibyte
@@ -186,6 +187,7 @@ For BBDB 2.33 or earlier."
                              (eword-decode-string
                               (decode-mime-charset-string
                                fn wl-mime-charset))))
+                    fn (funcall bbdb-wl-canonicalize-full-name-function fn)
                    ad (std11-address-string structure))
              ;; ignore uninteresting addresses, this is kinda gross!
              (when (or (not (stringp uninteresting-senders))
@@ -222,8 +224,7 @@ For BBDB 2.34 or later."
                                (std11-unfold-string header-content)))
              (while (and (setq structure (car structures))
                          (eq (car structure) 'mailbox))
-               (setq fn (funcall bbdb-wl-canonicalize-full-name-function
-                                 (std11-full-name-string structure))
+                (setq fn (std11-full-name-string structure)
                      fn (and fn
                              (with-temp-buffer ; to keep raw buffer unibyte.
                                (elmo-set-buffer-multibyte
@@ -231,6 +232,7 @@ For BBDB 2.34 or later."
                                (eword-decode-string
                                 (decode-mime-charset-string
                                  fn wl-mime-charset))))
+                     fn (funcall bbdb-wl-canonicalize-full-name-function fn)
                      ad (std11-address-string structure))
                ;; ignore uninteresting addresses, this is kinda gross!
                (when (or (not (stringp uninteresting-senders))