--- /dev/null
+Return-Path: <sojkam1@fel.cvut.cz>\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 BCA766DE18EF\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Oct 2015 16:30:13 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.258\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.258 tagged_above=-999 required=5 tests=[AWL=1.848,\r
+ RCVD_IN_DNSWL_MED=-2.3, RP_MATCHES_RCVD=-0.55, URIBL_SBL=0.644,\r
+ URIBL_SBL_A=0.1] 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 oufG01Ow7W4e for <notmuch@notmuchmail.org>;\r
+ Mon, 26 Oct 2015 16:30:11 -0700 (PDT)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+ by arlo.cworth.org (Postfix) with ESMTP id E35196DE17DC\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Oct 2015 16:30:08 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.7])\r
+ by max.feld.cvut.cz (Postfix) with ESMTP id 48F8619F499F;\r
+ Tue, 27 Oct 2015 00:23:05 +0100 (CET)\r
+X-Virus-Scanned: IMAP STYX AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+ by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new, port 10044)\r
+ with ESMTP id stsj_y6TueB0; Tue, 27 Oct 2015 00:23:03 +0100 (CET)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+ by max.feld.cvut.cz (Postfix) with ESMTP id 45EDD19F499E;\r
+ Tue, 27 Oct 2015 00:23:02 +0100 (CET)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.86)\r
+ (envelope-from <sojkam1@fel.cvut.cz>)\r
+ id 1Zqr6S-0007ad-Iw; Tue, 27 Oct 2015 00:23:00 +0100\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v8 1/3] emacs: replace use of\r
+ notmuch-address-message-insinuate\r
+Date: Tue, 27 Oct 2015 00:22:47 +0100\r
+Message-Id: <1445901769-29134-2-git-send-email-sojkam1@fel.cvut.cz>\r
+X-Mailer: git-send-email 2.5.3\r
+In-Reply-To: <1445901769-29134-1-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1445901769-29134-1-git-send-email-sojkam1@fel.cvut.cz>\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: Mon, 26 Oct 2015 23:30:13 -0000\r
+\r
+From: David Bremner <david@tethera.net>\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.5.3\r
+\r
projects / notmuch-archives.git / commitdiff