Commits

Anonymous committed ebca422

sync with Sourceforge CVS

  • Participants
  • Parent commits 6886d61

Comments (0)

Files changed (2)

 
 ;;; This file is an addition to the Insidious Big Brother Database
 ;;; (aka BBDB), copyright (c) 1991, 1992 Jamie Zawinski
-;;; <jwz@netscape.com>.
+;;; <jwz@jwz.org>.
 ;;;
 ;;; The Insidious Big Brother Database is free software; you can redistribute
 ;;; it and/or modify it under the terms of the GNU General Public License as
 (defun bbdb/sc-consult-attr (from)
   "Extract citing information from BBDB using sc-consult where
 FROM is user e-mail address to look for in BBDB."
-    ;; if logged in user sent this, use recipients.
-    (let ((check (if (or (null from)
-             (string-match (bbdb-user-mail-names) from))
-             (car (cdr (mail-extract-address-components
-                (or (sc-mail-field "to") from))))
-           from)))
-      (if from
-      (let ((record (bbdb-search-simple nil from)))
-        (and record (bbdb-record-getprop record bbdb/sc-attribution-field))))))
+  ;; if logged in user sent this, use recipients.
+  (let ((from (if (or (null from)
+                      (string-match (bbdb-user-mail-names) from))
+                  (car (cdr (mail-extract-address-components
+                             (or (sc-mail-field "to") from))))
+                from)))
+    (if from
+        (let ((record (bbdb-search-simple nil from)))
+          (and record
+               (bbdb-record-getprop record bbdb/sc-attribution-field))))))
 
 (defun bbdb/sc-set-attr ()
   "Add attribute to BBDB."
       (end                          (setq sc-mail-headers-end (point))))))
 
 ;; insert our hooks - call me from your Emacs initialization file
-(defvar attribution nil) ;; dammit, supercite!
-
+(defvar attribution) ;; dammit, supercite!
 ;;;###autoload
 (defun bbdb-insinuate-sc ()
   "Call this function to hook BBDB into Supercite."
 ;;; -*- Mode:Emacs-Lisp -*-
 
 ;;; This file is the part of the Insidious Big Brother Database (aka BBDB),
-;;; copyright (c) 1995 Jamie Zawinski <jwz@netscape.com>.
+;;; copyright (c) 1995 Jamie Zawinski <jwz@jwz.org>.
 ;;; Invoking BBDB from another process, via `gnudoit'.
 ;;; See the file bbdb.texinfo for documentation.
 ;;;
 
 ;;; A trivial application of this is the shell command:
 ;;;
-;;;    echo 'From: Jamie Zawinski <jwz@netscape.com>' | bbdb-srv.perl
+;;;    echo 'From: Jamie Zawinski <jwz@jwz.org>' | bbdb-srv.perl
 ;;;
 ;;; which will cause the corresponding record to be displayed.
 ;;; A more interesting application of this is:
        (prog1 bbdb/srv-itimer-arg
      (setq bbdb/srv-itimer-arg nil)))))
 
+;;;###autoload
 (defun bbdb/srv-handle-headers-with-delay (headers)
   "Just like bbdb/srv-handle-headers, but only updates every few seconds.
 This is so that trying to display many records in succession won't queue them
     nil))
 
 ;;;###autoload
-(fset 'bbdb-srv 'bbdb/srv-handle-headers-with-delay)
+(defalias 'bbdb-srv 'bbdb/srv-handle-headers-with-delay)
+
+(autoload 'bbdb-header-start "bbdb-hooks")
 
 ;;;###autoload
 (defun bbdb/srv-auto-create-mail-news-dispatcher ()