1 Return-Path: <dmitry.kurochkin@gmail.com>
\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 3A3BC429E32
\r
6 for <notmuch@notmuchmail.org>; Sat, 17 Dec 2011 15:40:08 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id K4bYhdsWY9Nl for <notmuch@notmuchmail.org>;
\r
17 Sat, 17 Dec 2011 15:40:07 -0800 (PST)
\r
18 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com
\r
19 [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 9E0F2429E35
\r
22 for <notmuch@notmuchmail.org>; Sat, 17 Dec 2011 15:40:06 -0800 (PST)
\r
23 Received: by mail-wi0-f181.google.com with SMTP id hq2so801993wib.26
\r
24 for <notmuch@notmuchmail.org>; Sat, 17 Dec 2011 15:40:06 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=4GoT3cexxpZfudgHZMaifuLYOs0IXsTB7jrQnyd7lJU=;
\r
28 b=FjxqXckhVXDat4gTkc2IlFH3Gc87J+gF5aIYAnhYCN+fZjWOPWiKSRqCATIveypGzo
\r
29 cRl1ZK4p2f5wbpYkocrKoXDKtz7dVs7Jk0YKCRFTKevyXIhSvVo1mg8OGahwV+6kSCkU
\r
30 PB6VXW5EZmxIS0myfIPCADNm1OP9+VoKZ7VME=
\r
31 Received: by 10.180.14.5 with SMTP id l5mr19792981wic.44.1324165206270;
\r
32 Sat, 17 Dec 2011 15:40:06 -0800 (PST)
\r
33 Received: from localhost ([91.144.186.21])
\r
34 by mx.google.com with ESMTPS id gg1sm19966882wbb.17.2011.12.17.15.40.05
\r
35 (version=TLSv1/SSLv3 cipher=OTHER);
\r
36 Sat, 17 Dec 2011 15:40:05 -0800 (PST)
\r
37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH v3 4/4] emacs: do not call `notmuch-hello-mode' on update
\r
40 Date: Sun, 18 Dec 2011 03:39:14 +0400
\r
41 Message-Id: <1324165154-5728-5-git-send-email-dmitry.kurochkin@gmail.com>
\r
42 X-Mailer: git-send-email 1.7.7.3
\r
43 In-Reply-To: <1324165154-5728-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
44 References: <1324095619-10870-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
45 <1324165154-5728-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Sat, 17 Dec 2011 23:40:08 -0000
\r
60 `notmuch-hello' should call `notmuch-hello-mode' function only when
\r
61 run for the first time. But before the change, `notmuch-hello' used
\r
62 `kill-all-local-variables' to remove editable widgets fields. This
\r
63 caused the major mode to be reset, and `notmuch-hello-mode' to be
\r
66 The patch manually deletes all editable widget fields and removes
\r
67 `kill-all-local-variables' call.
\r
69 emacs/notmuch-hello.el | 10 ++++++----
\r
71 2 files changed, 6 insertions(+), 5 deletions(-)
\r
73 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
74 index ca3a381..c158e89 100644
\r
75 --- a/emacs/notmuch-hello.el
\r
76 +++ b/emacs/notmuch-hello.el
\r
77 @@ -403,11 +403,13 @@ Complete list of currently available key bindings:
\r
80 (widget-value (widget-at)))
\r
83 + (inhibit-read-only t))
\r
85 - (kill-all-local-variables)
\r
86 - (let ((inhibit-read-only t))
\r
88 + ;; delete all editable widget fields
\r
89 + (mapc 'widget-delete widget-field-list)
\r
93 (unless (eq major-mode 'notmuch-hello-mode)
\r
94 (notmuch-hello-mode))
\r
95 diff --git a/test/emacs b/test/emacs
\r
96 index b4c2444..dffad0f 100755
\r
99 @@ -486,7 +486,6 @@ counter=$(test_emacs \
\r
100 test_expect_equal "$counter" 1
\r
102 test_begin_subtest "notmuch-hello-mode hook is not called on updates"
\r
103 -test_subtest_known_broken
\r
104 counter=$(test_emacs \
\r
105 '(let ((notmuch-hello-mode-hook-counter 0))
\r
106 (kill-buffer "*notmuch-hello*")
\r