X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-address.el;h=64887a43fe652b04332e0e3ed9b15577656cc9f8;hp=15c709da70a43b6eb0aa7dc8128b8c322df11846;hb=e02bb7e9fdbc96c66f32ce531509824f8afd4686;hpb=9951598d11f9e883374d295f886009cdb64d8f63

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 15c709da..64887a43 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -66,6 +66,7 @@ disabled."
 	  (const :tag "Disable address completion" nil)
 	  (string :tag "Use external completion command"))
   :group 'notmuch-send
+  :group 'notmuch-address
   :group 'notmuch-external)
 
 (defcustom notmuch-address-internal-completion '(sent nil)
@@ -93,6 +94,7 @@ This should be a list of the form '(DIRECTION FILTER), where
 	 (setq notmuch-address-completions (clrhash notmuch-address-completions))
 	 (setq notmuch-address-full-harvest-finished nil))
   :group 'notmuch-send
+  :group 'notmuch-address
   :group 'notmuch-external)
 
 (defcustom notmuch-address-save-filename nil
@@ -104,6 +106,7 @@ should make sure it is not somewhere publicly readable."
   :type '(choice (const :tag "Off" nil)
 		 (file :tag "Filename"))
   :group 'notmuch-send
+  :group 'notmuch-address
   :group 'notmuch-external)
 
 (defcustom notmuch-address-selection-function 'notmuch-address-selection-function
@@ -115,6 +118,7 @@ See documentation of function `notmuch-address-selection-function'
 to know how address selection is made by default."
   :type 'function
   :group 'notmuch-send
+  :group 'notmuch-address
   :group 'notmuch-external)
 
 (defcustom notmuch-address-post-completion-functions nil
@@ -145,7 +149,8 @@ matching `notmuch-address-completion-headers-regexp'.
 (defcustom notmuch-address-use-company t
   "If available, use company mode for address completion"
   :type 'boolean
-  :group 'notmuch-send)
+  :group 'notmuch-send
+  :group 'notmuch-address)
 
 (defun notmuch-address-setup ()
   (let* ((setup-company (and notmuch-address-use-company
@@ -154,7 +159,7 @@ matching `notmuch-address-completion-headers-regexp'.
 		       #'notmuch-address-expand-name)))
       (when setup-company
 	(notmuch-company-setup))
-      (unless (memq pair message-completion-alist)
+      (unless (member pair message-completion-alist)
 	(setq message-completion-alist
 	      (push pair message-completion-alist)))))
 
@@ -312,7 +317,7 @@ execution, CALLBACK is called when harvesting finishes."
 			    (when config-query
 			      (format " and (%s)" config-query)))
 		  from-or-to-me-query))
-	 (args `("address" "--format=sexp" "--format-version=2"
+	 (args `("address" "--format=sexp" "--format-version=4"
 		 ,(if sent "--output=recipients" "--output=sender")
 		 "--deduplicate=address"
 		 ,query)))