dot/emacs (bbdb-canonicalize-net-hook): Handle `nil' address.

It turns out that, despite the documentation not mentioning this at all,
that the hook is allowed to return `nil' to suppress insertion of the
address into the database at all.  The only snag is that `nil' is
/still/ sent back to the hook to check for convergence.  So notice this
and return `nil' back, since it's not like we're going to be able to
turn it into anything more useful.

diff --git a/dot/emacs b/dot/emacs
index 13ac888936c23fbc947306447cf3c0b6c90dd3e4..afb08bdf4be21b053732a6bfbf28c81808ae2a7e 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -211,7 +211,9 @@
              "\\)$")
       bbdb-canonicalize-net-hook
       (lambda (addr)
-       (cond ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+       (cond ((null addr)
+              nil)
+             ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
                                     "HTML-[0-9]+-[0-9]+-[0-9]+"
                                     "@\\(nationwide-communications\\.co\\.uk\\)")
                             addr)