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 89F22431FAE for ; Mon, 16 Jan 2012 08:54:04 -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 b4QTJ0gVJRJG for ; Mon, 16 Jan 2012 08:53:58 -0800 (PST) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 39B15431FAF for ; Mon, 16 Jan 2012 08:53:58 -0800 (PST) Received: by werb13 with SMTP id b13so6495wer.26 for ; Mon, 16 Jan 2012 08:53:57 -0800 (PST) Received: by 10.216.138.101 with SMTP id z79mr4223907wei.7.1326732835435; Mon, 16 Jan 2012 08:53:55 -0800 (PST) Received: from localhost ([109.131.75.86]) by mx.google.com with ESMTPS id ek1sm12346829wib.10.2012.01.16.08.53.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Jan 2012 08:53:50 -0800 (PST) From: Pieter Praet To: David Edmondson , Jameson Graef Rollins Subject: [PATCH v2] emacs: `notmuch-show-buttonize-links' only `notmuch-show's a message if it exists Date: Mon, 16 Jan 2012 17:51:59 +0100 Message-Id: <1326732719-23493-1-git-send-email-pieter@praet.org> X-Mailer: git-send-email 1.7.8.1 In-Reply-To: <87lip7a8yh.fsf@praet.org> References: <87lip7a8yh.fsf@praet.org> Cc: Notmuch Mail 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: Mon, 16 Jan 2012 16:54:04 -0000 * emacs/notmuch-show.el (notmuch-show-found-target-p): new predicate function that uses notmuch(1) 'count' to see if a query turns up any results. * emacs/notmuch-show.el (notmuch-show-if-found): new function that only shows a message/thread if present in the database and otherwise returns an error. * emacs/notmuch-show.el (notmuch-show-buttonize-links): some deduplication, and use new function `notmuch-show-if-found' instead of `notmuch-show' to prevent showing a blank screen for Message-Id's which aren't present in the database. --- v2: (corrections by David Edmondson [1]) - `notmuch-show-found-target-p' : removed useless `substring'. - `notmuch-show-if-found' : remove redundant `format'. ... and added a missing closing paren due to badly splitting up the original commit. [1] id:"cun7h0r50v6.fsf@hotblack-desiato.hh.sledj.net" emacs/notmuch-show.el | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f101d76..7a79d06 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -803,14 +803,17 @@ a corresponding notmuch search." (save-excursion (goto-char start) (while (re-search-forward "id:\\(\"?\\)[^[:space:]\"]+\\1" end t) - ;; remove the overlay created by goto-address-mode - (remove-overlays (match-beginning 0) (match-end 0) 'goto-address t) - (make-text-button (match-beginning 0) (match-end 0) - 'action `(lambda (arg) - (notmuch-show ,(match-string-no-properties 0))) - 'follow-link t - 'help-echo "Mouse-1, RET: search for this message" - 'face goto-address-mail-face)))) + (let ((message-id (match-string-no-properties 0)) + (string-start (match-beginning 0)) + (string-end (match-end 0))) + ;; remove the overlay created by goto-address-mode + (remove-overlays string-start string-end 'goto-address t) + (make-text-button string-start string-end + 'action `(lambda (arg) + (notmuch-show-if-found ,message-id)) + 'follow-link t + 'help-echo "Mouse-1, RET: search for this message" + 'face goto-address-mail-face))))) ;;;###autoload (defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name crypto-switch) @@ -903,6 +906,18 @@ thread id. If a prefix is given, crypto processing is toggled." (notmuch-kill-this-buffer) (notmuch-show-worker thread-id parent-buffer query-context buffer-name process-crypto))) +(defun notmuch-show-found-target-p (target) + (let ((args `("count" ,target))) + (> (string-to-number + (with-output-to-string + (apply 'call-process notmuch-command nil standard-output nil args))) + 0))) + +(defun notmuch-show-if-found (target &rest args) + (if (notmuch-show-found-target-p target) + (notmuch-show target args) + (error "Can't find target: %s" target))) + (defvar notmuch-show-stash-map (let ((map (make-sparse-keymap))) (define-key map "c" 'notmuch-show-stash-cc) -- 1.7.8.1