Commits

Anonymous committed 544ab4e

* sync to master BBDB CVS (no actual changes, just catching up)

Comments (0)

Files changed (1)

lisp/bbdb-reportmail.el

 (defun bbdb/reportmail-alternate-full-name (address)
   (if address
       (let ((entry (bbdb-search-simple nil address)))
-	(if entry
-	    (or (bbdb-record-getprop entry 'mail-name)
-		(bbdb-record-name entry))))))
+    (if entry
+        (or (bbdb-record-getprop entry 'mail-name)
+        (bbdb-record-name entry))))))
 
 (defadvice display-time-get-field
   (around bbdb/reportmail-hack-display-time-get-field disable activate)
     ;; Call the original display-time-get-field
     ad-do-it
     (if (or (string= gf-field "To") (string= gf-field "From"))
-	(setq ad-return-value
-	      (or
-	       ;; If this message is to me, then do nothing so
-	       ;; reportmail can trap this case in
-	       ;; display-time-process-new-mail
-	       (if (display-time-member ad-return-value
+    (setq ad-return-value
+          (or
+           ;; If this message is to me, then do nothing so
+           ;; reportmail can trap this case in
+           ;; display-time-process-new-mail
+           (if (display-time-member ad-return-value
                       display-time-my-addresses)
-		   ad-return-value
-		 nil)
-	       ;; Is the sender/recipient in our BBDB?
-	       (bbdb/reportmail-alternate-full-name
-		(car (cdr (mail-extract-address-components ad-return-value))))
-	       ;; Can't find sender/recipient in BBDB; do nothing.
-	       ad-return-value)
-	      ))))
+           ad-return-value
+         nil)
+           ;; Is the sender/recipient in our BBDB?
+           (bbdb/reportmail-alternate-full-name
+        (car (cdr (mail-extract-address-components ad-return-value))))
+           ;; Can't find sender/recipient in BBDB; do nothing.
+           ad-return-value)
+          ))))
 
 ;;;###autoload
 (defun bbdb-insinuate-reportmail ()
   "Call this function to hook BBDB into reportmail."
   (ad-enable-advice 'display-time-get-field 'around
-		    'bbdb/reportmail-hack-display-time-get-field)
+            'bbdb/reportmail-hack-display-time-get-field)
   (ad-activate 'display-time-get-field)
   (message "Insinuated BBDB into Reportmail.")
 )