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