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 9AE55429E37 for ; Thu, 12 Jan 2012 09:25:48 -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 QR1TMh8i7tIb for ; Thu, 12 Jan 2012 09:25:48 -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 064DA429E30 for ; Thu, 12 Jan 2012 09:25:47 -0800 (PST) Received: by werm12 with SMTP id m12so1808422wer.26 for ; Thu, 12 Jan 2012 09:25:46 -0800 (PST) Received: by 10.216.135.208 with SMTP id u58mr254136wei.56.1326389146877; Thu, 12 Jan 2012 09:25:46 -0800 (PST) Received: from localhost ([109.131.126.209]) by mx.google.com with ESMTPS id g12sm10093619wiw.10.2012.01.12.09.25.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Jan 2012 09:25:46 -0800 (PST) From: Pieter Praet To: Jameson Graef Rollins Subject: [PATCH 2/3] emacs: `notmuch-show-buttonize-links' only `notmuch-show's a message if it exists Date: Thu, 12 Jan 2012 18:23:44 +0100 Message-Id: <1326389025-18877-2-git-send-email-pieter@praet.org> X-Mailer: git-send-email 1.7.8.1 In-Reply-To: <1326389025-18877-1-git-send-email-pieter@praet.org> References: <874nw0ltwz.fsf@praet.org> <1326389025-18877-1-git-send-email-pieter@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: Thu, 12 Jan 2012 17:25:48 -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. --- emacs/notmuch-show.el | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index c55a1d1..8f12955 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -806,11 +806,14 @@ a corresponding notmuch search." (save-excursion (goto-char start) (while (re-search-forward "id:\\(\"?\\)[^[:space:]\"]+\\1" end t) + (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 (match-beginning 0) (match-end 0) 'goto-address t) - (make-text-button (match-beginning 0) (match-end 0) + (remove-overlays string-start string-end 'goto-address t) + (make-text-button string-start string-end 'action `(lambda (arg) - (notmuch-show ,(match-string-no-properties 0))) + (notmuch-show-if-found ,message-id)) 'follow-link t 'help-echo "Mouse-1, RET: search for this message" 'face goto-address-mail-face)))) @@ -906,6 +909,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 (substring + (with-output-to-string + (apply 'call-process notmuch-command nil standard-output nil args)) + 0 -1)) 0))) + +(defun notmuch-show-if-found (target &rest args) + (if (notmuch-show-found-target-p target nil) + (notmuch-show target args) + (error (format "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