X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-address.el;h=e2af8792c34af6ad95e01ca29f2e8a3eaca33c25;hb=0e671478;hp=32c84909e4ffe1bb8032d397930f863daf9ede1e;hpb=238bf4cb09423cac4efa968e70184daad39e2846;p=notmuch

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 32c84909..e2af8792 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -23,14 +23,33 @@
 
 ;;
 
-(defcustom notmuch-address-command "notmuch-addresses"
+(defcustom notmuch-address-command nil
   "The command which generates possible addresses. It must take a
 single argument and output a list of possible matches, one per
-line."
-  :type 'string
+line. The default value of nil disables address completion."
+  :type '(radio
+	  (const :tag "Disable address completion" nil)
+	  (string :tag "Use external completion command" "notmuch-addresses"))
   :group 'notmuch-send
   :group 'notmuch-external)
 
+(defcustom notmuch-address-selection-function 'notmuch-address-selection-function
+  "The function to select address from given list. The function is
+called with PROMPT, COLLECTION, and INITIAL-INPUT as arguments
+(subset of what `completing-read' can be called with).
+While executed the value of `completion-ignore-case' is t.
+See documentation of function `notmuch-address-selection-function'
+to know how address selection is made by default."
+  :type 'function
+  :group 'notmuch-send
+  :group 'notmuch-external)
+
+(defun notmuch-address-selection-function (prompt collection initial-input)
+  "Call (`completing-read'
+      PROMPT COLLECTION nil nil INITIAL-INPUT 'notmuch-address-history)"
+  (completing-read
+   prompt collection nil nil initial-input 'notmuch-address-history))
+
 (defvar notmuch-address-message-alist-member
   '("^\\(Resent-\\)?\\(To\\|B?Cc\\|Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\):"
 	      . notmuch-address-expand-name))
@@ -38,10 +57,12 @@ line."
 (defvar notmuch-address-history nil)
 
 (defun notmuch-address-message-insinuate ()
+  (message "calling notmuch-address-message-insinuate is no longer needed"))
+
+(defun notmuch-address-setup ()
   (unless (memq notmuch-address-message-alist-member message-completion-alist)
     (setq message-completion-alist
 	  (push notmuch-address-message-alist-member message-completion-alist))))
-
 (defun notmuch-address-options (original)
   (process-lines notmuch-address-command original))
 
@@ -53,7 +74,8 @@ line."
 		(point)))
 	 (orig (buffer-substring-no-properties beg end))
 	 (completion-ignore-case t)
-	 (options (notmuch-address-options orig))
+	 (options (with-temp-message "Looking for completion candidates..."
+		    (notmuch-address-options orig)))
 	 (num-options (length options))
 	 (chosen (cond
 		  ((eq num-options 0)
@@ -61,9 +83,9 @@ line."
 		  ((eq num-options 1)
 		   (car options))
 		  (t
-		   (completing-read (format "Address (%s matches): " num-options)
-				    (cdr options) nil nil (car options)
-				    'notmuch-address-history)))))
+		   (funcall notmuch-address-selection-function
+			    (format "Address (%s matches): " num-options)
+			    (cdr options) (car options))))))
     (if chosen
 	(progn
 	  (push chosen notmuch-address-history)
@@ -91,52 +113,4 @@ line."
 			   (not (file-directory-p bin))))
 	      (throw 'found-command bin))))))))
 
-;; If we can find the program specified by `notmuch-address-command',
-;; insinuate ourselves into `message-mode'.
-(when (notmuch-address-locate-command notmuch-address-command)
-  (notmuch-address-message-insinuate))
-
-;; functions to add sender / recipients to BBDB
-
-(defun notmuch-bbdb/snarf-headers (headers)
-  ;; Helper function to avoid code duplication in the two below
-  ;; headers should have the same format as bbdb-get-addresses-headers
-
-  ;; bbdb-get-addresses reads these
-  ;; Ugh, pass-by-global
-  (let ((addrs (bbdb-get-addresses nil nil 'notmuch-bbdb/get-header-content))
-	(bbdb-get-addresses-headers headers) ; headers to read
-	(bbdb-gag-messages t)) ; suppress m/n processed message)
-    (bbdb-update-records addrs t t))
-
-  (defun notmuch-bbdb/snarf-from ()
-    "Import the sender of the current message into BBDB"
-    (interactive)
-    (notmuch-bbdb/snarf-headers
-     (list (assoc 'authors bbdb-get-addresses-headers))))
-
-(defun notmuch-bbdb/snarf-to ()
-  "Import all recipients of the current message into BBDB"
-  (interactive)
-  (notmuch-bbdb/snarf-headers
-   (list (assoc 'recipients bbdb-get-addresses-headers))))
-
-(defvar notmuch-bbdb/header-by-name
-  ;; both are case sensitive
-  '( ("From" . :From)
-     ("To" . :To)
-     ("CC" . :Cc)
-     ("BCC" . :Bcc)
-     ("Resent-From" . nil)
-     ("Reply-To" . nil)
-     ("Resent-To" . nil)
-     ("Resent-CC" . nil))
-  "Alist for dispatching header symbols as used by notmuch-show-get-header
-from strings as used by bbdb-get-addresses")
-
-(defun notmuch-bbdb/get-header-content (name)
-  (notmuch-show-get-header (cdr (assoc name notmuch-bbdb/header-by-name))))
-
-;;
-
 (provide 'notmuch-address)