--- /dev/null
+Return-Path: <dme@dme.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 arlo.cworth.org (Postfix) with ESMTP id 0EACC6DE1862\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Mar 2016 01:35:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.153\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.153 tagged_above=-999 required=5\r
+ tests=[AWL=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id peqf_iivyE_F for <notmuch@notmuchmail.org>;\r
+ Mon, 14 Mar 2016 01:35:54 -0700 (PDT)\r
+Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com\r
+ [74.125.82.46]) by arlo.cworth.org (Postfix) with ESMTPS id 71D5D6DE1855 for\r
+ <notmuch@notmuchmail.org>; Mon, 14 Mar 2016 01:35:53 -0700 (PDT)\r
+Received: by mail-wm0-f46.google.com with SMTP id p65so91305080wmp.1\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Mar 2016 01:35:53 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=to:cc:subject:in-reply-to:references:from:date:message-id\r
+ :mime-version; bh=rhpalH7RARxSbuRDRF4WAS+Qj2Q0WyCRevokxxs+hGo=;\r
+ b=HaoWx/RTpaCat6VD76oplH/KKrToCPi2DMO+tSNpPRt2yJ6sAAMf/KF86dHnY4aL4a\r
+ nG/F2rXp1aahF+mgkyz2n9BngW6JNXlJ6MKMhP9jOiGEZ1jEHpi4/xyBOzvOSMwh5c0O\r
+ l1EPpRa6Q3Hk9B7GoeJbYQFV1fnUEWtV3V7fQYN6rkaSWn5sDhmVOS3omoqj1hBjvKn8\r
+ t12rBOyYo7GAcheXlw60zpYzCn4nrxU4KkfNm2pndtznVAn+CwO6GTlMGAPeCjrrXZsS\r
+ Rm8Acef19tSaRmPcvL9X3HLk5dLp1453iLSj1jTBdiCl2sVJJvjTtwqge6voR/+f2XGi\r
+ DLQw==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:to:cc:subject:in-reply-to:references:from:date\r
+ :message-id:mime-version;\r
+ bh=rhpalH7RARxSbuRDRF4WAS+Qj2Q0WyCRevokxxs+hGo=;\r
+ b=Mp4wJ+SUw0qbVD17yoXk4BcdBtcGSpJHymCqkqMWeubgAwC/hNP5slwELiso0zFi+s\r
+ WG/4TSAKoSGayJn+617219GGa/wTHfrnTx9IB0AowQPWdkE1ZJQzXEjnQI0wCuSSbffZ\r
+ JCEZswcZ1EM+f5dyb6KFicbqHAxpZxS6Bs291sa29T8U29oZmZ81djWrFpizKT0nvdDI\r
+ uxxJRGzi9ot6HArBINhGaA7XCigoY3Y/+F5Q37Yr2C/n3carMDPtPpbR5if85lY70QmQ\r
+ xI6U/dLJRzl5+4d9GtXRQAkOukA2If4Y3zszrJkVVWOt5k4LmTPh0MEby/+dpmE87ClQ\r
+ h5+Q==\r
+X-Gm-Message-State:\r
+ AD7BkJIKOb5VgjpgnE4m5Or+oi658MyiJdHytXNDu6FvZxY3qIysfQL60P+6q+ryRsdaVA==\r
+X-Received: by 10.28.60.84 with SMTP id j81mr16508989wma.91.1457944552130;\r
+ Mon, 14 Mar 2016 01:35:52 -0700 (PDT)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id ys9sm21024027wjc.35.2016.03.14.01.35.50\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Mon, 14 Mar 2016 01:35:51 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 596438cd;\r
+ Mon, 14 Mar 2016 08:35:50 +0000 (UTC)\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: hello: promote '?' as the universal help key\r
+In-Reply-To: <1457872037-22561-1-git-send-email-jani@nikula.org>\r
+References: <1457872037-22561-1-git-send-email-jani@nikula.org>\r
+From: David Edmondson <dme@dme.org>\r
+Date: Mon, 14 Mar 2016 08:35:50 +0000\r
+Message-ID: <m2k2l5qwwp.fsf@dme.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 14 Mar 2016 08:35:56 -0000\r
+\r
+Looks good, thanks for doing it.\r
+\r
+On Sun, Mar 13 2016, Jani Nikula wrote:\r
+> Move the brief help text at the bottom of the hello screen to the\r
+> notmuch-hello-mode help, and promote '?' as the universal help key\r
+> across Notmuch. This unclutters the hello screen, and allows for a\r
+> more verbose description in the mode help. Hopefully, this change is\r
+> useful for both experienced and new users alike.\r
+>\r
+> While at it, improve the links to Notmuch and hello screen\r
+> customization.\r
+>\r
+> ---\r
+>\r
+> This obsoletes\r
+> id:1450026221-23286-1-git-send-email-jani@nikula.org\r
+> ---\r
+> emacs/notmuch-hello.el | 44 +++++++++++++++++-----\r
+> test/emacs.expected-output/notmuch-hello | 7 +---\r
+> .../emacs.expected-output/notmuch-hello-long-names | 7 +---\r
+> .../notmuch-hello-no-saved-searches | 7 +---\r
+> .../emacs.expected-output/notmuch-hello-with-empty | 7 +---\r
+> 5 files changed, 42 insertions(+), 30 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+> index b42e0f24148a..8a31f9a1c52c 100644\r
+> --- a/emacs/notmuch-hello.el\r
+> +++ b/emacs/notmuch-hello.el\r
+> @@ -672,6 +672,31 @@ with `notmuch-hello-query-counts'."\r
+> (defun notmuch-hello-mode ()\r
+> "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.\r
+> \r
+> +Saved searches are \"bookmarks\" for arbitrary queries. Hit RET\r
+> +or click on a saved search to view matching threads. Edit saved\r
+> +searches with the `edit' button. Type `\\[notmuch-jump-search]'\r
+> +in any Notmuch screen for quick access to saved searches that\r
+> +have shortcut keys.\r
+> +\r
+> +Type new searches in the search box and hit RET to view matching\r
+> +threads. Hit RET in a recent search box to re-submit a previous\r
+> +search. Edit it first if you like. Save a recent search to saved\r
+> +searches with the `save' button.\r
+> +\r
+> +Hit `\\[notmuch-search]' or `\\[notmuch-tree]' in any Notmuch\r
+> +screen to search for messages and view matching threads or\r
+> +messages, respectively. Recent searches are available in the\r
+> +minibuffer history.\r
+> +\r
+> +Expand the all tags view with the `show' button (and collapse\r
+> +again with the `hide' button). Hit RET or click on a tag name to\r
+> +view matching threads.\r
+> +\r
+> +Hit `\\[notmuch-refresh-this-buffer]' to refresh the screen and\r
+> +`\\[notmuch-bury-or-kill-this-buffer]' to quit.\r
+> +\r
+> +The screen may be customized via `\\[customize]'.\r
+> +\r
+> Complete list of currently available key bindings:\r
+> \r
+> \\{notmuch-hello-mode-map}"\r
+> @@ -907,20 +932,19 @@ following:\r
+> (defun notmuch-hello-insert-footer ()\r
+> "Insert the notmuch-hello footer."\r
+> (let ((start (point)))\r
+> - (widget-insert "Type a search query and hit RET to view matching threads.\n")\r
+> - (when notmuch-search-history\r
+> - (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")\r
+> - (widget-insert "Save recent searches with the `save' button.\n"))\r
+> - (when notmuch-saved-searches\r
+> - (widget-insert "Edit saved searches with the `edit' button.\n"))\r
+> - (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")\r
+> - (widget-insert "`=' to refresh this screen. `s' to search messages. `q' to quit.\n")\r
+> + (widget-insert "Hit `?' for context-sensitive help in any Notmuch screen.\n")\r
+> + (widget-insert "Customize ")\r
+> + (widget-create 'link\r
+> + :notify (lambda (&rest ignore)\r
+> + (customize-group 'notmuch))\r
+> + :button-prefix "" :button-suffix ""\r
+> + "Notmuch")\r
+> + (widget-insert " or ")\r
+> (widget-create 'link\r
+> :notify (lambda (&rest ignore)\r
+> (customize-variable 'notmuch-hello-sections))\r
+> :button-prefix "" :button-suffix ""\r
+> - "Customize")\r
+> - (widget-insert " this page.")\r
+> + "this page.")\r
+> (let ((fill-column (- (window-width) notmuch-hello-indent)))\r
+> (center-region start (point)))))\r
+> \r
+> diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello\r
+> index 9ba4cfc1d560..89186082f8a9 100644\r
+> --- a/test/emacs.expected-output/notmuch-hello\r
+> +++ b/test/emacs.expected-output/notmuch-hello\r
+> @@ -8,8 +8,5 @@ Search: .\r
+> \r
+> All tags: [show]\r
+> \r
+> - Type a search query and hit RET to view matching threads.\r
+> - Edit saved searches with the `edit' button.\r
+> - Hit RET or click on a saved search or tag name to view matching threads.\r
+> - `=' to refresh this screen. `s' to search messages. `q' to quit.\r
+> - Customize this page.\r
+> + Hit `?' for context-sensitive help in any Notmuch screen.\r
+> + Customize Notmuch or this page.\r
+> diff --git a/test/emacs.expected-output/notmuch-hello-long-names b/test/emacs.expected-output/notmuch-hello-long-names\r
+> index 1c8d6eb624b9..da0f3525325d 100644\r
+> --- a/test/emacs.expected-output/notmuch-hello-long-names\r
+> +++ b/test/emacs.expected-output/notmuch-hello-long-names\r
+> @@ -11,8 +11,5 @@ All tags: [hide]\r
+> 52 a-very-long-tag 52 inbox 52 unread\r
+> 4 attachment 7 signed\r
+> \r
+> - Type a search query and hit RET to view matching threads.\r
+> - Edit saved searches with the `edit' button.\r
+> - Hit RET or click on a saved search or tag name to view matching threads.\r
+> - `=' to refresh this screen. `s' to search messages. `q' to quit.\r
+> - Customize this page.\r
+> + Hit `?' for context-sensitive help in any Notmuch screen.\r
+> + Customize Notmuch or this page.\r
+> diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
+> index 05475b15abee..939965fef154 100644\r
+> --- a/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
+> +++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
+> @@ -4,8 +4,5 @@ Search: .\r
+> \r
+> All tags: [show]\r
+> \r
+> - Type a search query and hit RET to view matching threads.\r
+> - Edit saved searches with the `edit' button.\r
+> - Hit RET or click on a saved search or tag name to view matching threads.\r
+> - `=' to refresh this screen. `s' to search messages. `q' to quit.\r
+> - Customize this page.\r
+> + Hit `?' for context-sensitive help in any Notmuch screen.\r
+> + Customize Notmuch or this page.\r
+> diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty\r
+> index 854e0c2a22e8..97d7db26ebfa 100644\r
+> --- a/test/emacs.expected-output/notmuch-hello-with-empty\r
+> +++ b/test/emacs.expected-output/notmuch-hello-with-empty\r
+> @@ -8,8 +8,5 @@ Search: .\r
+> \r
+> All tags: [show]\r
+> \r
+> - Type a search query and hit RET to view matching threads.\r
+> - Edit saved searches with the `edit' button.\r
+> - Hit RET or click on a saved search or tag name to view matching threads.\r
+> - `=' to refresh this screen. `s' to search messages. `q' to quit.\r
+> - Customize this page.\r
+> + Hit `?' for context-sensitive help in any Notmuch screen.\r
+> + Customize Notmuch or this page.\r
+> -- \r
+> 2.1.4\r
projects / notmuch-archives.git / commitdiff