From 3577dc2a22762f16674fa08b5b1ab6ac0ba8b39a Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 16 Jul 2014 19:03:16 +0100 Subject: [PATCH] [PATCH] emacs: show: make return value of notmuch-show-get-prop explicit --- b4/ae8437f91d6900769d318a3c34bf4d84c789e9 | 94 +++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 b4/ae8437f91d6900769d318a3c34bf4d84c789e9 diff --git a/b4/ae8437f91d6900769d318a3c34bf4d84c789e9 b/b4/ae8437f91d6900769d318a3c34bf4d84c789e9 new file mode 100644 index 000000000..b10df6b61 --- /dev/null +++ b/b4/ae8437f91d6900769d318a3c34bf4d84c789e9 @@ -0,0 +1,94 @@ +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 20374431FC0 + for ; Wed, 16 Jul 2014 11:03:54 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + 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 2rN0NTq0sHPW for ; + Wed, 16 Jul 2014 11:03:46 -0700 (PDT) +Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com + [209.85.212.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 97A5C431FBD + for ; Wed, 16 Jul 2014 11:03:46 -0700 (PDT) +Received: by mail-wi0-f175.google.com with SMTP id ho1so6684237wib.8 + for ; Wed, 16 Jul 2014 11:03:44 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=r/AqnI9AnsZCsKKKR/FaSvL2OF1gWgF71uFggfCw6Wc=; + b=HNnn9U4xsU/cSxMpNx97bH1l9EGPt+1g/YPc1nEGNavXBkOshGI9kqXVdCWCD7lKMR + hWYhfrue28iQ1nLDzX4rRygAm5e3hn3Gf/Jh5nClhkt0+Bumd2oWl0ceh8vFMOOBBVO3 + KGn0fYFFYTNuGU/wAFqVs9uxzEpmF0PtJy+oOqhonoPmHZSgwYHe8cHxIKZEf31P84NE + iFysXuVBXRa157+QJEfhA5pFBsJuE+FMRxbme/fqSue9tyN98DdOXizwiIopUQuPFK72 + M/uBvyQNgKk2eNk/AVI9HuLIdoz3BiA0Dz+N0Mn0qmZsUG8JVHUuilSgvVWtwRmnJLAN + TOng== +X-Received: by 10.180.78.100 with SMTP id a4mr1188087wix.36.1405533824039; + Wed, 16 Jul 2014 11:03:44 -0700 (PDT) +Received: from localhost ([194.42.225.52]) + by mx.google.com with ESMTPSA id u10sm68408wjz.43.2014.07.16.11.03.43 + for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Wed, 16 Jul 2014 11:03:43 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH] emacs: show: make return value of notmuch-show-get-prop + explicit +Date: Wed, 16 Jul 2014 19:03:16 +0100 +Message-Id: <1405533796-8780-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <874myhabi0.fsf@maritornes.cs.unb.ca> +References: <874myhabi0.fsf@maritornes.cs.unb.ca> +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, 16 Jul 2014 18:03:54 -0000 + +This makes the fact the notmuch-show-get-prop returns nil if the major +mode is neither show not tree explicit. +--- +This is a followup to the patch and review comment at +id:874myhabi0.fsf@maritornes.cs.unb.ca + +Best wishes + +Mark + + emacs/notmuch-show.el | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 529baa9..7549fbb 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1485,7 +1485,8 @@ they just need the correct message properties." + (cond ((eq major-mode 'notmuch-show-mode) + (notmuch-show-get-message-properties)) + ((eq major-mode 'notmuch-tree-mode) +- (notmuch-tree-get-message-properties)))))) ++ (notmuch-tree-get-message-properties)) ++ (t nil))))) + (plist-get props prop))) + + (defun notmuch-show-get-message-id (&optional bare) +-- +1.7.10.4 + -- 2.26.2