emacs: replace use of notmuch-address-message-insinuate

[notmuch.git] / emacs / notmuch-address.el

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 2e8b8402f2c29fa8580adabc92aec61438bcddf4..e2af8792c34af6ad95e01ca29f2e8a3eaca33c25 100644 (file)
--- 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 ()
-  (if (not (memq notmuch-address-message-alist-member message-completion-alist))
-      (setq message-completion-alist
-           (push notmuch-address-message-alist-member message-completion-alist))))
+  (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,11 +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))
-
-;;
-
 (provide 'notmuch-address)