--- /dev/null
+Return-Path: <pieter@praet.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 00773431FC3\r
+ for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 9wI8j5gdtlv0 for <notmuch@notmuchmail.org>;\r
+ Wed, 22 Feb 2012 10:45:57 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+ [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 933C4431FBD\r
+ for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:56 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so270670wib.26\r
+ for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:55 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of pieter@praet.org designates\r
+ 10.216.135.66 as permitted sender) client-ip=10.216.135.66; \r
+Authentication-Results: mr.google.com;\r
+ spf=pass (google.com: domain of pieter@praet.org\r
+ designates 10.216.135.66 as permitted sender)\r
+ smtp.mail=pieter@praet.org\r
+Received: from mr.google.com ([10.216.135.66])\r
+ by 10.216.135.66 with SMTP id t44mr9685524wei.52.1329936355506\r
+ (num_hops = 1); Wed, 22 Feb 2012 10:45:55 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=gamma;\r
+ h=mime-version:from:to:subject:date:message-id:x-mailer:in-reply-to\r
+ :references:x-gm-message-state;\r
+ bh=w2iLCeFp1vWpqgiVlgptFyJpyKu1Em+uaIGTOsYozPI=;\r
+ b=w6vOfa0RZUpGYEMB5R1vwtaZswoo0h3EnmjRVYKBAbUVCO/zQHpLf7GlPN/QfF6oP2\r
+ Ud5HEQ7mDUiWddbddmjsoqUQObEQpVYvwT4GmQslqXSWYHaOsL4vfv8tiubdFBl6zU57\r
+ 0olF5jvMIbKl0tCMZvLRVN/N1/nPFt+4N1NfY=\r
+MIME-Version: 1.0\r
+Received: by 10.216.135.66 with SMTP id t44mr8033467wei.52.1329936355371;\r
+ Wed, 22 Feb 2012 10:45:55 -0800 (PST)\r
+Received: from localhost ([109.131.181.26])\r
+ by mx.google.com with ESMTPS id s2sm74866974wix.3.2012.02.22.10.45.54\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Wed, 22 Feb 2012 10:45:55 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v2 3/7] emacs: rename `notmuch-show-toggle-headers' to\r
+ `notmuch-show-toggle-visibility-headers'\r
+Date: Wed, 22 Feb 2012 19:43:30 +0100\r
+Message-Id: <1329936214-30959-3-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.8.1\r
+In-Reply-To: <1327469139-1968-1-git-send-email-pieter@praet.org>\r
+References: <1327469139-1968-1-git-send-email-pieter@praet.org>\r
+X-Gm-Message-State:\r
+ ALoCoQm1ZG4cfqBbuyuxj0sxnLVWckQ3Ro1FJrvuYYJAa7MaNCcethKiGaGmcAo+/JUZXNz9/gck\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 22 Feb 2012 18:45:58 -0000\r
+\r
+* emacs/notmuch-show.el\r
+\r
+ (notmuch-show-toggle-headers):\r
+ Rename to `notmuch-show-toggle-visibility-headers'.\r
+\r
+ (notmuch-show-mode-map):\r
+ Update "h" binding wrt renamed `notmuch-show-toggle-headers'.\r
+\r
+ (notmuch-message-headers):\r
+ Update docstring wrt renamed `notmuch-show-toggle-headers'.\r
+\r
+ (notmuch-message-headers-visible):\r
+ Update docstring wrt renamed `notmuch-show-toggle-headers'.\r
+ Also fixed a small typo.\r
+\r
+* test/emacs:\r
+\r
+ Update subtest wrt renamed `notmuch-show-toggle-headers':\r
+ - "notmuch-show: hide message headers (w/ notmuch-show-toggle-headers)"\r
+---\r
+ emacs/notmuch-show.el | 12 ++++++------\r
+ test/emacs | 4 ++--\r
+ 2 files changed, 8 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index aa9ccee..861018d 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -48,8 +48,8 @@ (defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date")\r
+ \r
+ For an open message, all of these headers will be made visible\r
+ according to `notmuch-message-headers-visible' or can be toggled\r
+-with `notmuch-show-toggle-headers'. For a closed message, only\r
+-the first header in the list will be visible."\r
++with `notmuch-show-toggle-visibility-headers'. For a closed message,\r
++only the first header in the list will be visible."\r
+ :type '(repeat string)\r
+ :group 'notmuch-show)\r
+ \r
+@@ -59,8 +59,8 @@ (defcustom notmuch-message-headers-visible t\r
+ If this value is non-nil, then all of the headers defined in\r
+ `notmuch-message-headers' will be visible by default in the display\r
+ of each message. Otherwise, these headers will be hidden and\r
+-`notmuch-show-toggle-headers' can be used to make the visible for\r
+-any given message."\r
++`notmuch-show-toggle-visibility-headers' can be used to make them\r
++visible for any given message."\r
+ :type 'boolean\r
+ :group 'notmuch-show)\r
+ \r
+@@ -1168,7 +1168,7 @@ (defvar notmuch-show-mode-map\r
+ (define-key map "v" 'notmuch-show-view-all-mime-parts)\r
+ (define-key map "c" 'notmuch-show-stash-map)\r
+ (define-key map "=" 'notmuch-show-refresh-view)\r
+- (define-key map "h" 'notmuch-show-toggle-headers)\r
++ (define-key map "h" 'notmuch-show-toggle-visibility-headers)\r
+ (define-key map "*" 'notmuch-show-tag-all)\r
+ (define-key map "-" 'notmuch-show-remove-tag)\r
+ (define-key map "+" 'notmuch-show-add-tag)\r
+@@ -1650,7 +1650,7 @@ (defun notmuch-show-remove-tag ()\r
+ (interactive)\r
+ (notmuch-show-tag "-"))\r
+ \r
+-(defun notmuch-show-toggle-headers ()\r
++(defun notmuch-show-toggle-visibility-headers ()\r
+ "Toggle the visibility of the current message headers."\r
+ (interactive)\r
+ (let ((props (notmuch-show-get-message-properties)))\r
+diff --git a/test/emacs b/test/emacs\r
+index 7d6e6ee..f17efbd 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -399,12 +399,12 @@ test_emacs \\r
+ (test-visible-output))'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-hidden\r
+ \r
+-test_begin_subtest "notmuch-show: hide message headers (w/ notmuch-show-toggle-headers)"\r
++test_begin_subtest "notmuch-show: hide message headers (w/ notmuch-show-toggle-visibility-headers)"\r
+ test_emacs \\r
+ '(let ((notmuch-message-headers '\''("Subject" "To" "Cc" "Date"))\r
+ (notmuch-message-headers-visible t))\r
+ (notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")\r
+- (notmuch-show-toggle-headers)\r
++ (notmuch-show-toggle-visibility-headers)\r
+ (test-visible-output))'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-hidden\r
+ \r
+-- \r
+1.7.8.1\r
+\r