1 Return-Path: <pieter@praet.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 34880431FB6
\r
6 for <notmuch@notmuchmail.org>; Sat, 16 Apr 2011 06:17:30 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id YmLY9N+3uWsq for <notmuch@notmuchmail.org>;
\r
16 Sat, 16 Apr 2011 06:17:26 -0700 (PDT)
\r
17 Received: from mail-wy0-f181.google.com (mail-wy0-f181.google.com
\r
18 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 36401431FB5
\r
21 for <notmuch@notmuchmail.org>; Sat, 16 Apr 2011 06:17:26 -0700 (PDT)
\r
22 Received: by wyi11 with SMTP id 11so3978263wyi.26
\r
23 for <notmuch@notmuchmail.org>; Sat, 16 Apr 2011 06:17:25 -0700 (PDT)
\r
24 Received: by 10.216.121.200 with SMTP id r50mr539565weh.7.1302959844864;
\r
25 Sat, 16 Apr 2011 06:17:24 -0700 (PDT)
\r
26 Received: from localhost (99.28-240-81.adsl-dyn.isp.belgacom.be
\r
27 [81.240.28.99]) by mx.google.com with ESMTPS id
\r
28 t72sm1735074wei.44.2011.04.16.06.17.23 (version=TLSv1/SSLv3 cipher=OTHER);
\r
29 Sat, 16 Apr 2011 06:17:24 -0700 (PDT)
\r
30 From: Pieter Praet <pieter@praet.org>
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH] emacs: notmuch-hello: respect notmuch-help's wishes
\r
33 Date: Sat, 16 Apr 2011 15:12:43 +0200
\r
34 User-Agent: Notmuch/0.5-86-g4875299 (http://notmuchmail.org) Emacs/23.1.50.1
\r
35 (x86_64-pc-linux-gnu)
\r
37 <87ei522v4t.fsf@A7GMS.i-did-not-set--mail-host-address--so-tickle-me>
\r
39 Content-Type: text/plain; charset=us-ascii
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Sat, 16 Apr 2011 13:17:30 -0000
\r
54 Calling notmuch-help in notmuch-hello-mode results in error
\r
55 "apply: Wrong type argument: listp, keymap"
\r
57 As this is the very first screen new users see, a failing
\r
58 notmuch-help can be considered a marketing catastrophe.
\r
60 Appears to be in introduced in commit 9ccd978665103a20
\r
61 (patch id:"1273857338-20127-1-git-send-email-nelhage@mit.edu").
\r
63 This patch makes notmuch-hello-mode-map consistent with
\r
64 notmuch-show-mode-map and notmuch-search-mode-map.
\r
66 To keep everything in working order, awaiting a real fix,
\r
67 I copied in widget-keymap's bindings (as defined in "wid-edit.el").
\r
69 Signed-off-by: Pieter Praet <pieter@praet.org>
\r
71 emacs/notmuch-hello.el | 12 +++++++++++-
\r
72 1 files changed, 11 insertions(+), 1 deletions(-)
\r
74 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
75 index e58dd24..1193f74 100644
\r
76 --- a/emacs/notmuch-hello.el
\r
77 +++ b/emacs/notmuch-hello.el
\r
78 @@ -290,7 +290,17 @@ should be. Returns a cons cell `(tags-per-line width)'."
\r
80 (defvar notmuch-hello-mode-map
\r
81 (let ((map (make-sparse-keymap)))
\r
82 - (set-keymap-parent map widget-keymap)
\r
83 + ; TODO make this play nice with notmuch-help:
\r
84 + ; (set-keymap-parent map widget-keymap)
\r
85 + ; In the meantime, make due with a copy of widget-keymap's contents:
\r
86 + (define-key map "\t" 'widget-forward)
\r
87 + (define-key map "\e\t" 'widget-backward)
\r
88 + (define-key map [(shift tab)] 'advertised-widget-backward)
\r
89 + (define-key map [backtab] 'widget-backward)
\r
90 + (define-key map [down-mouse-2] 'widget-button-click)
\r
91 + (define-key map [down-mouse-1] 'widget-button-click)
\r
92 + (define-key map [(control ?m)] 'widget-button-press)
\r
93 + ; end of widget-keymap's contents
\r
94 (define-key map "v" '(lambda () "Display the notmuch version" (interactive)
\r
95 (message "notmuch version %s" (notmuch-version))))
\r
96 (define-key map "?" 'notmuch-help)
\r