Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 6E05E431FD0 for ; Fri, 16 Dec 2011 20:21:08 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4PeMi-r9cAqH for ; Fri, 16 Dec 2011 20:21:07 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id B2EF6429E26 for ; Fri, 16 Dec 2011 20:21:06 -0800 (PST) Received: by mail-ww0-f45.google.com with SMTP id ds13so5879879wgb.2 for ; Fri, 16 Dec 2011 20:21:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=py0MWGpr22YIzT2Tt6ySsYH4nwzowJbiWP2T7oIFBls=; b=EGu6LYO5Epq3waO6V19JXyj5nAd2E4OI1bFvBEDoEK/n43nrl4O/9i/8br5FGs38QO rFoyhEDJ05bJgqgfxkmcAEa+tj3cnvfRmp7wWeDQgBcAwaH8V/R51iMpJSkrmSCumas9 uBtJYSvqaH34AqlWAiDYlzHXxrTNtW/KbsUeY= Received: by 10.227.203.78 with SMTP id fh14mr7338535wbb.12.1324095666357; Fri, 16 Dec 2011 20:21:06 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id gn4sm15789108wib.20.2011.12.16.20.21.05 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Dec 2011 20:21:05 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH 4/4] emacs: do not call `notmuch-hello-mode' on update Date: Sat, 17 Dec 2011 08:20:19 +0400 Message-Id: <1324095619-10870-4-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1324095619-10870-1-git-send-email-dmitry.kurochkin@gmail.com> References: <1324095619-10870-1-git-send-email-dmitry.kurochkin@gmail.com> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Sat, 17 Dec 2011 04:21:09 -0000 `notmuch-hello' should call `notmuch-hello-mode' function only when run for the first time. But before the change, `notmuch-hello' used `kill-all-local-variables' to remove editable widgets fields. This caused the major mode to be reset, and `notmuch-hello-mode' to be called every time. The patch manually deletes all editable widget fields and removes `kill-all-local-variables' call. --- emacs/notmuch-hello.el | 11 +++++++---- test/emacs | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index ca3a381..3b21f55 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -403,11 +403,14 @@ Complete list of currently available key bindings: (progn (widget-forward 1) (widget-value (widget-at))) - (error nil))))) + (error nil)))) + (inhibit-read-only t)) - (kill-all-local-variables) - (let ((inhibit-read-only t)) - (erase-buffer)) + ;; delete all editable widget fields + (let ((all widget-field-list)) + (mapc 'widget-delete widget-field-list)) + + (erase-buffer) (unless (eq major-mode 'notmuch-hello-mode) (notmuch-hello-mode)) diff --git a/test/emacs b/test/emacs index b4c2444..dffad0f 100755 --- a/test/emacs +++ b/test/emacs @@ -486,7 +486,6 @@ counter=$(test_emacs \ test_expect_equal "$counter" 1 test_begin_subtest "notmuch-hello-mode hook is not called on updates" -test_subtest_known_broken counter=$(test_emacs \ '(let ((notmuch-hello-mode-hook-counter 0)) (kill-buffer "*notmuch-hello*") -- 1.7.7.3