X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-address.el;h=71985ed79dfcce86985002abf2c97e7d9ddb0a65;hb=b4ee80dcbdd6702a693110321ad69c380967846d;hp=cd0ffb67fcfab19eacd1b1d6a6258ac185e2ed4e;hpb=e63f37a4a90c5d2a399a99a0566b6e1dfea263aa;p=notmuch

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index cd0ffb67..71985ed7 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -36,9 +36,9 @@
 This variable is set by calling `notmuch-address-harvest'.")
 
 (defvar notmuch-address-full-harvest-finished nil
-  "t indicates that full completion address harvesting has been finished.
-Use notmuch-address--harvest-ready to access as that will load a
-saved hash if necessary (and available).")
+  "Whether full completion address harvesting has finished.
+Use `notmuch-address--harvest-ready' to access as that will load
+a saved hash if necessary (and available).")
 
 (defun notmuch-address--harvest-ready ()
   "Return t if there is a full address hash available.
@@ -172,11 +172,11 @@ toggles the setting in this buffer."
   (interactive)
   (if (local-variable-p 'notmuch-address-command)
       (kill-local-variable 'notmuch-address-command)
-    (notmuch-setq-local notmuch-address-command 'internal))
+    (setq-local notmuch-address-command 'internal))
   (when (boundp 'company-idle-delay)
     (if (local-variable-p 'company-idle-delay)
 	(kill-local-variable 'company-idle-delay)
-      (notmuch-setq-local company-idle-delay nil))))
+      (setq-local company-idle-delay nil))))
 
 (defun notmuch-address-matching (substring)
   "Returns a list of completion candidates matching SUBSTRING.
@@ -250,25 +250,6 @@ requiring external commands."
 	(ding))))
    (t nil)))
 
-;; Copied from `w3m-which-command'.
-(defun notmuch-address-locate-command (command)
-  "Return non-nil if `command' is an executable either on
-`exec-path' or an absolute pathname."
-  (and (stringp command)
-       (if (and (file-name-absolute-p command)
-		(file-executable-p command))
-	   command
-	 (setq command (file-name-nondirectory command))
-	 (catch 'found-command
-	   (let (bin)
-	     (dolist (dir exec-path)
-	       (setq bin (expand-file-name command dir))
-	       (when (or (and (file-executable-p bin)
-			      (not (file-directory-p bin)))
-			 (and (file-executable-p (setq bin (concat bin ".exe")))
-			      (not (file-directory-p bin))))
-		 (throw 'found-command bin))))))))
-
 (defun notmuch-address-harvest-addr (result)
   (let ((name-addr (plist-get result :name-addr)))
     (puthash name-addr t notmuch-address-completions)))
@@ -294,7 +275,7 @@ The car is a partial harvest, and the cdr is a full harvest.")
   "Collect addresses completion candidates.
 
 It queries the notmuch database for messages sent/received (as
-configured with `notmuch-address-command`) by the user, collects
+configured with `notmuch-address-command') by the user, collects
 destination/source addresses from those messages and stores them
 in `notmuch-address-completions'.