From: david Date: Sun, 2 Jun 2013 15:02:31 +0000 (+2100) Subject: [PATCH] emacs: replace setq + let with let* X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4b7738c2ab55279e64c24adeddd8171956bca28;p=notmuch-archives.git [PATCH] emacs: replace setq + let with let* --- diff --git a/15/4b541065a57fcd002b82989c1c007bea9f64c9 b/15/4b541065a57fcd002b82989c1c007bea9f64c9 new file mode 100644 index 000000000..c98ca449b --- /dev/null +++ b/15/4b541065a57fcd002b82989c1c007bea9f64c9 @@ -0,0 +1,119 @@ +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 EA451421168 + for ; Sun, 2 Jun 2013 08:02:58 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 1k5FWg+Kym6O for ; + Sun, 2 Jun 2013 08:02:53 -0700 (PDT) +Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id EBBCC429E58 + for ; Sun, 2 Jun 2013 08:02:52 -0700 (PDT) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id r52F2jca020729; + Sun, 2 Jun 2013 12:02:45 -0300 +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) + (envelope-from ) + id 1Uj9nx-0006vI-En; Sun, 02 Jun 2013 12:02:45 -0300 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Uj9nr-0006DH-LW; Sun, 02 Jun 2013 12:02:39 -0300 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH] emacs: replace setq + let with let* +Date: Sun, 2 Jun 2013 12:02:31 -0300 +Message-Id: <1370185351-23834-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.2.rc2 +In-Reply-To: <1370175370-13561-1-git-send-email-david@tethera.net> +References: <1370175370-13561-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +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: Sun, 02 Jun 2013 15:02:59 -0000 + +From: David Bremner + +I found several places where a setq is immediately followed by a let +or a let*. This seems to be the pessimal combination, with the +implicit scope of the setq combined with the extra indentation of the let. +I combined these cases into a single let* which I think is easier to read. +In two places I turned a single clause let into a let*. +--- + emacs/notmuch-hello.el | 4 ++-- + emacs/notmuch-show.el | 4 ++-- + emacs/notmuch.el | 5 ++--- + 3 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el +index c1c6f4b..15e3614 100644 +--- a/emacs/notmuch-hello.el ++++ b/emacs/notmuch-hello.el +@@ -260,8 +260,8 @@ afterwards.") + (defun notmuch-hello-search (&optional search) + (interactive) + (unless (null search) +- (setq search (notmuch-hello-trim search)) +- (let ((history-delete-duplicates t)) ++ (let* ((search (notmuch-hello-trim search)) ++ (history-delete-duplicates t)) + (add-to-history 'notmuch-search-history search))) + (notmuch-search search notmuch-search-oldest-first nil nil + #'notmuch-hello-search-continuation)) +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 18b4671..e8c8343 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1734,8 +1734,8 @@ TAG-CHANGES is a list of tag operations for `notmuch-tag'." + + See `notmuch-tag' for information on the format of TAG-CHANGES." + (interactive) +- (setq tag-changes (notmuch-tag (notmuch-show-get-message-id) tag-changes)) +- (let* ((current-tags (notmuch-show-get-tags)) ++ (let* ((tag-changes (notmuch-tag (notmuch-show-get-message-id) tag-changes)) ++ (current-tags (notmuch-show-get-tags)) + (new-tags (notmuch-update-tags current-tags tag-changes))) + (unless (equal current-tags new-tags) + (notmuch-show-set-tags new-tags)))) +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index af107e2..edb5a1c 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -904,9 +904,8 @@ Other optional parameters are used as follows: + target-line: The line number to move to if the target thread does not + appear in the search results." + (interactive) +- (if (null query) +- (setq query (notmuch-read-query "Notmuch search: "))) +- (let ((buffer (get-buffer-create (notmuch-search-buffer-title query)))) ++ (let* ((query (or query (notmuch-read-query "Notmuch search: "))) ++ (buffer (get-buffer-create (notmuch-search-buffer-title query)))) + (switch-to-buffer buffer) + (notmuch-search-mode) + ;; Don't track undo information for this buffer +-- +1.8.2.rc2 +