X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch.el;h=ba833e642e82efc5a30a019b953f154f206e4feb;hb=6c84116091db77c0123e12cdf8331600bf0c7769;hp=99e0c93af01971a059d3c50c3c68f9e849477295;hpb=4d17a34286dc67fd434a9c8ca3518bf878ecf78b;p=notmuch

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 99e0c93a..ba833e64 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -85,11 +85,13 @@ For example:
 `notmuch-read-tag-changes' function.")
 
 (defun notmuch-tag-completions (&optional search-terms)
+  (if (null search-terms)
+      (setq search-terms (list "*")))
   (split-string
    (with-output-to-string
      (with-current-buffer standard-output
        (apply 'call-process notmuch-command nil t
-	      nil "search-tags" search-terms)))
+	      nil "search" "--output=tags" "--exclude=false" search-terms)))
    "\n+" t))
 
 (defun notmuch-select-tag-with-completion (prompt &rest search-terms)
@@ -962,7 +964,7 @@ PROMPT is the string to prompt with."
 					 completions)))
 	       (t (list string)))))))
       ;; this was simpler than convincing completing-read to accept spaces:
-      (define-key keymap (kbd "<tab>") 'minibuffer-complete)
+      (define-key keymap (kbd "TAB") 'minibuffer-complete)
       (let ((history-delete-duplicates t))
 	(read-from-minibuffer prompt nil keymap nil
 			      'notmuch-search-history nil nil)))))