From 00adbda251a5d689af4090bc3b6cebcec43d7656 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 3 Apr 2013 18:08:54 +0300 Subject: [PATCH] [PATCH 1/1] emacs/notmuch-address.el: add notmuch-address-selection-function --- 86/59d5daf90bc6fb46843eab8c4ba45f17dbf089 | 115 ++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 86/59d5daf90bc6fb46843eab8c4ba45f17dbf089 diff --git a/86/59d5daf90bc6fb46843eab8c4ba45f17dbf089 b/86/59d5daf90bc6fb46843eab8c4ba45f17dbf089 new file mode 100644 index 000000000..8e8efd960 --- /dev/null +++ b/86/59d5daf90bc6fb46843eab8c4ba45f17dbf089 @@ -0,0 +1,115 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 3B0FF431FAF + for ; Wed, 3 Apr 2013 08:09:06 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id wvwUAWb78Ox4 for ; + Wed, 3 Apr 2013 08:09:05 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 1D3EF431FAE + for ; Wed, 3 Apr 2013 08:09:05 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id AAC021000CF; Wed, 3 Apr 2013 18:09:02 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 1/1] emacs/notmuch-address.el: add + notmuch-address-selection-function +Date: Wed, 3 Apr 2013 18:08:54 +0300 +Message-Id: <1365001734-3160-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 03 Apr 2013 15:09:06 -0000 + +Added a customizable variable notmuch-address-selection-function +and the function with the same name to provide a way for user to +change the function called to do address selection. + +By default the functionality is exactly the same as it has been so +far; completing-read is called with the same parameters as before. + +Setting equivalent lambda expression in place of using +notmuch-address-selection-function function is done as follows: + +(setq notmuch-address-selection-function + (lambda (prompt collection initial-input) + (completing-read prompt collection nil nil initial-input))) + +For example drop-in replacement with ido-completing-read can be done +easily as an one alternative to the default. +--- + +My replacement is: + +(require 'selection-menu) +(setq notmuch-address-selection-function + (lambda (prompt collection initial-input) + (selection-menu "Send To:" collection t))) + + emacs/notmuch-address.el | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el +index 2bf762b..fa65cd5 100644 +--- a/emacs/notmuch-address.el ++++ b/emacs/notmuch-address.el +@@ -31,6 +31,23 @@ line." + :group 'notmuch-send + :group 'notmuch-external) + ++(defcustom notmuch-address-selection-function 'notmuch-address-selection-function ++ "The function to select address from given list. The function is ++called with PROMPT, COLLECTION, and INITIAL-INPUT as arguments ++(subset of what `completing-read' can be called with). ++While executed the value of `completion-ignore-case' is t. ++See documentation of function `notmuch-address-selection-function' ++to know how address selection is made by default." ++ :type 'function ++ :group 'notmuch-send ++ :group 'notmuch-external) ++ ++(defun notmuch-address-selection-function (prompt collection initial-input) ++ "Call (`completing-read' ++ PROMPT COLLECTION nil nil INITIAL-INPUT 'notmuch-address-history)" ++ (completing-read ++ prompt collection nil nil initial-input 'notmuch-address-history)) ++ + (defvar notmuch-address-message-alist-member + '("^\\(Resent-\\)?\\(To\\|B?Cc\\|Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\):" + . notmuch-address-expand-name)) +@@ -61,9 +78,9 @@ line." + ((eq num-options 1) + (car options)) + (t +- (completing-read (format "Address (%s matches): " num-options) +- (cdr options) nil nil (car options) +- 'notmuch-address-history))))) ++ (funcall notmuch-address-selection-function ++ (format "Address (%s matches): " num-options) ++ (cdr options) (car options)))))) + (if chosen + (progn + (push chosen notmuch-address-history) +-- +1.8.0 + -- 2.26.2