[Patch v7 1/3] emacs: replace use of notmuch-address-message-insinuate

diff --git a/03/70573ed2f5a334a28a2dfbb45305b845bfca57 b/03/70573ed2f5a334a28a2dfbb45305b845bfca57
new file mode 100644 (file)
index 0000000..80379ad
--- /dev/null
+++ b/03/70573ed2f5a334a28a2dfbb45305b845bfca57
@@ -0,0 +1,124 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id E4AA26DE1405\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Oct 2015 08:25:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.098 tagged_above=-999 required=5 tests=[AWL=0.098]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id XVcSDrMyoZpd for <notmuch@notmuchmail.org>;\r
+ Sun, 25 Oct 2015 08:25:45 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 271946DE1403\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Oct 2015 08:25:45 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1ZqNAN-0004zu-2O; Sun, 25 Oct 2015 15:25:03 +0000\r
+Received: (nullmailer pid 13825 invoked by uid 1000); Sun, 25 Oct 2015\r
+ 15:24:09 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v7 1/3] emacs: replace use of\r
+ notmuch-address-message-insinuate\r
+Date: Sun, 25 Oct 2015 12:23:56 -0300\r
+Message-Id: <1445786638-13763-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.6.1\r
+In-Reply-To: <1445786638-13763-1-git-send-email-david@tethera.net>\r
+References: <1445786638-13763-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 25 Oct 2015 15:25:47 -0000\r
+\r
+This allows e.g. Gnus users to load this file without changing\r
+message-mode behaviour.\r
+\r
+This will disable completion for those that did not customize the\r
+variable but relied on the existence of a file named "notmuch-addresses"\r
+in their path. In the next commit the default behaviour will change to\r
+use a "workalike" internal completion mechanism.\r
+---\r
+ emacs/notmuch-address.el | 19 ++++++++-----------\r
+ emacs/notmuch-mua.el     |  4 +++-\r
+ 2 files changed, 11 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el\r
+index fde3c1b..e2af879 100644\r
+--- a/emacs/notmuch-address.el\r
++++ b/emacs/notmuch-address.el\r
+@@ -23,11 +23,13 @@\r
+ \r
+ ;;\r
+ \r
+-(defcustom notmuch-address-command "notmuch-addresses"\r
++(defcustom notmuch-address-command nil\r
+   "The command which generates possible addresses. It must take a\r
+ single argument and output a list of possible matches, one per\r
+-line."\r
+-  :type 'string\r
++line. The default value of nil disables address completion."\r
++  :type '(radio\r
++        (const :tag "Disable address completion" nil)\r
++        (string :tag "Use external completion command" "notmuch-addresses"))\r
+   :group 'notmuch-send\r
+   :group 'notmuch-external)\r
+ \r
+@@ -55,10 +57,12 @@ to know how address selection is made by default."\r
+ (defvar notmuch-address-history nil)\r
+ \r
+ (defun notmuch-address-message-insinuate ()\r
++  (message "calling notmuch-address-message-insinuate is no longer needed"))\r
++\r
++(defun notmuch-address-setup ()\r
+   (unless (memq notmuch-address-message-alist-member message-completion-alist)\r
+     (setq message-completion-alist\r
+         (push notmuch-address-message-alist-member message-completion-alist))))\r
+-\r
+ (defun notmuch-address-options (original)\r
+   (process-lines notmuch-address-command original))\r
+ \r
+@@ -109,11 +113,4 @@ to know how address selection is made by default."\r
+                          (not (file-directory-p bin))))\r
+             (throw 'found-command bin))))))))\r
+ \r
+-;; If we can find the program specified by `notmuch-address-command',\r
+-;; insinuate ourselves into `message-mode'.\r
+-(when (notmuch-address-locate-command notmuch-address-command)\r
+-  (notmuch-address-message-insinuate))\r
+-\r
+-;;\r
+-\r
+ (provide 'notmuch-address)\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 57465b2..fd98ea4 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -269,7 +269,9 @@ Note that these functions use `mail-citation-hook' if that is non-nil."\r
+   (set-buffer-modified-p nil))\r
+ \r
+ (define-derived-mode notmuch-message-mode message-mode "Message[Notmuch]"\r
+-  "Notmuch message composition mode. Mostly like `message-mode'")\r
++  "Notmuch message composition mode. Mostly like `message-mode'"\r
++  (when notmuch-address-command\r
++    (notmuch-address-setup)))\r
+ \r
+ (define-key notmuch-message-mode-map (kbd "C-c C-c") #'notmuch-mua-send-and-exit)\r
+ (define-key notmuch-message-mode-map (kbd "C-c C-s") #'notmuch-mua-send)\r
+-- \r
+2.6.1\r
+\r