[PATCH] emacs: replace (funcall 'foo ...) with (foo ...)

diff --git a/54/f80ed9c0f612da408d981519696868c64d1c3c b/54/f80ed9c0f612da408d981519696868c64d1c3c
new file mode 100644 (file)
index 0000000..30e67ff
--- /dev/null
+++ b/54/f80ed9c0f612da408d981519696868c64d1c3c
@@ -0,0 +1,143 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 11564429E25\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Jun 2013 05:16:40 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 35zpnU-uHUll for <notmuch@notmuchmail.org>;\r
+       Sun,  2 Jun 2013 05:16:32 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DCD08431E64\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Jun 2013 05:16:31 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id r52CGO9d009519;\r
+       Sun, 2 Jun 2013 09:16:24 -0300\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Uj7Cx-0005jE-Dw; Sun, 02 Jun 2013 09:16:23 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Uj7Cr-0003Ym-RY; Sun, 02 Jun 2013 09:16:17 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: replace (funcall 'foo ...) with (foo ...)\r
+Date: Sun,  2 Jun 2013 09:16:10 -0300\r
+Message-Id: <1370175370-13561-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.2.rc2\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 02 Jun 2013 12:16:40 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+I can't see any benefit to the funcall, and it looks like the result\r
+of cut-and-paste from some code that actually used a variable for the\r
+function to call.\r
+---\r
+\r
+Mark and I were discussing some style issues in the context of pick,\r
+and it seems to me that some of the elisp style in the current code\r
+could be improved. I don't claim to be an elisp style expert by any\r
+stretch of the imagination. It would be great if some experts could\r
+add a section to devel/STYLE about elisp.\r
+\r
+\r
+ emacs/notmuch-message.el | 2 +-\r
+ emacs/notmuch-show.el    | 6 +++---\r
+ emacs/notmuch.el         | 4 ++--\r
+ 3 files changed, 6 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-message.el b/emacs/notmuch-message.el\r
+index 4dc4883..914bdd1 100644\r
+--- a/emacs/notmuch-message.el\r
++++ b/emacs/notmuch-message.el\r
+@@ -40,7 +40,7 @@ the \"inbox\" and \"todo\" tags, you would set:\r
+   ;; get the in-reply-to header and parse it for the message id.\r
+   (let ((rep (mail-header-parse-addresses (message-field-value "In-Reply-To"))))\r
+     (when (and notmuch-message-replied-tags rep)\r
+-      (funcall 'notmuch-tag (notmuch-id-to-query (car (car rep)))\r
++      (notmuch-tag (notmuch-id-to-query (car (car rep)))\r
+              (notmuch-tag-change-list notmuch-message-replied-tags)))))\r
+ \r
+ (add-hook 'message-send-hook 'notmuch-message-mark-replied)\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 613e666..18b4671 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1726,7 +1726,7 @@ TAG-CHANGES is a list of tag operations for `notmuch-tag'."\r
+   (let* ((current-tags (notmuch-show-get-tags))\r
+        (new-tags (notmuch-update-tags current-tags tag-changes)))\r
+     (unless (equal current-tags new-tags)\r
+-      (funcall 'notmuch-tag (notmuch-show-get-message-id) tag-changes)\r
++      (notmuch-tag (notmuch-show-get-message-id) tag-changes)\r
+       (notmuch-show-set-tags new-tags))))\r
+ \r
+ (defun notmuch-show-tag (&optional tag-changes)\r
+@@ -1734,7 +1734,7 @@ TAG-CHANGES is a list of tag operations for `notmuch-tag'."\r
+ \r
+ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+   (interactive)\r
+-  (setq tag-changes (funcall 'notmuch-tag (notmuch-show-get-message-id) tag-changes))\r
++  (setq tag-changes (notmuch-tag (notmuch-show-get-message-id) tag-changes))\r
+   (let* ((current-tags (notmuch-show-get-tags))\r
+        (new-tags (notmuch-update-tags current-tags tag-changes)))\r
+     (unless (equal current-tags new-tags)\r
+@@ -1745,7 +1745,7 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+ \r
+ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+   (interactive)\r
+-  (setq tag-changes (funcall 'notmuch-tag (notmuch-show-get-messages-ids-search) tag-changes))\r
++  (setq tag-changes (notmuch-tag (notmuch-show-get-messages-ids-search) tag-changes))\r
+   (notmuch-show-mapc\r
+    (lambda ()\r
+      (let* ((current-tags (notmuch-show-get-tags))\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 5a8c957..af107e2 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -562,7 +562,7 @@ will be signaled."\r
+ (defun notmuch-search-tag-region (beg end &optional tag-changes)\r
+   "Change tags for threads in the given region."\r
+   (let ((search-string (notmuch-search-find-thread-id-region-search beg end)))\r
+-    (setq tag-changes (funcall 'notmuch-tag search-string tag-changes))\r
++    (setq tag-changes (notmuch-tag search-string tag-changes))\r
+     (notmuch-search-foreach-result beg end\r
+       (lambda (pos)\r
+       (notmuch-search-set-tags\r
+@@ -576,7 +576,7 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+   (interactive)\r
+   (let* ((beg (if (region-active-p) (region-beginning) (point)))\r
+        (end (if (region-active-p) (region-end) (point))))\r
+-    (funcall 'notmuch-search-tag-region beg end tag-changes)))\r
++    (notmuch-search-tag-region beg end tag-changes)))\r
+ \r
+ (defun notmuch-search-add-tag ()\r
+   "Same as `notmuch-search-tag' but sets initial input to '+'."\r
+-- \r
+1.8.2.rc2\r
+\r