From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 0C9AF429E25 for ; Sun, 11 Dec 2011 13:48:29 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 bsS+-TrbXBI1 for ; Sun, 11 Dec 2011 13:48:28 -0800 (PST) Received: from mail-ey0-f181.google.com (mail-ey0-f181.google.com [209.85.215.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 29EB7431FB6 for ; Sun, 11 Dec 2011 13:48:28 -0800 (PST) Received: by eaan11 with SMTP id n11so681245eaa.26 for ; Sun, 11 Dec 2011 13:48:25 -0800 (PST) Received: by 10.213.108.142 with SMTP id f14mr1162030ebp.80.1323640105319; Sun, 11 Dec 2011 13:48:25 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi. [80.220.92.23]) by mx.google.com with ESMTPS id 17sm66496406eej.3.2011.12.11.13.48.22 (version=SSLv3 cipher=OTHER); Sun, 11 Dec 2011 13:48:23 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH] emacs: support "notmuch new" as a notmuch-poll-script Date: Sun, 11 Dec 2011 23:48:20 +0200 Message-Id: <1323640100-18326-1-git-send-email-jani@nikula.org> X-Mailer: git-send-email 1.7.5.4 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: Sun, 11 Dec 2011 21:48:29 -0000 Let notmuch-poll-script be a function as well as a string. Make default value nil instead of an empty string, but allow "" for backwards compatibility. Add a notmuch poll function to call "notmuch new" using the configured notmuch-command. This allows taking better advantage of the "notmuch new" hooks from emacs without intermediate scripts. Signed-off-by: Jani Nikula --- emacs/notmuch.el | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 8936149..6c7e800 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -965,28 +965,48 @@ same relative position within the new buffer." (notmuch-search query oldest-first target-thread target-line continuation) (goto-char (point-min)))) -(defcustom notmuch-poll-script "" - "An external script to incorporate new mail into the notmuch database. +(defcustom notmuch-poll-script nil + "A script or a function to incorporate new mail into the notmuch database. -If this variable is non empty, then it should name a script to be -invoked by `notmuch-search-poll-and-refresh-view' and -`notmuch-hello-poll-and-update' (each have a default keybinding -of 'G'). The script could do any of the following depending on +This variable can be set to a function or the name of an external +script to be invoked by `notmuch-search-poll-and-refresh-view' +and `notmuch-hello-poll-and-update' (each have a default +keybinding of 'G'). Set to nil to do nothing. + +The function or script could do any of the following depending on the user's needs: 1. Invoke a program to transfer mail to the local mail store 2. Invoke \"notmuch new\" to incorporate the new mail -3. Invoke one or more \"notmuch tag\" commands to classify the mail" - :type 'string +3. Invoke one or more \"notmuch tag\" commands to classify the mail + +You can also choose to use \"notmuch new\" through the provided +`notmuch-poll-script-notmuch-new' function, and have the +\"notmuch new\" hooks perform the actions above." + :type '(choice (const :tag "Not set" nil) + (const :tag "Notmuch new" notmuch-poll-script-notmuch-new) + (function :tag "Custom function" + :value notmuch-poll-script-notmuch-new) + (string :tag "Custom script")) :group 'notmuch) +(defun notmuch-poll-script-notmuch-new () + "Run \"notmuch new\"." + (call-process notmuch-command nil nil nil "new")) + (defun notmuch-poll () - "Run external script to import mail. + "Run external script or call a function to import mail. -Invokes `notmuch-poll-script' if it is not set to an empty string." +Invokes `notmuch-poll-script', which can be a function or the +name of an external script. Does nothing if `notmuch-poll-script' +is nil or an empty string." (interactive) - (if (not (string= notmuch-poll-script "")) - (call-process notmuch-poll-script nil nil))) + (cond + ((stringp notmuch-poll-script) + (if (not (string= notmuch-poll-script "")) ;; for backwards compatibility + (call-process notmuch-poll-script nil nil))) + ((functionp notmuch-poll-script) + (funcall notmuch-poll-script)))) (defun notmuch-search-poll-and-refresh-view () "Invoke `notmuch-poll' to import mail, then refresh the current view." -- 1.7.5.4