Re: [PATCH 1/1] emacs: fixed (declare-function ...) definitions

diff --git a/1f/f3843afb00d8cd28e01127634cdfb06ba6b42d b/1f/f3843afb00d8cd28e01127634cdfb06ba6b42d
new file mode 100644 (file)
index 0000000..fbfaeb2
--- /dev/null
+++ b/1f/f3843afb00d8cd28e01127634cdfb06ba6b42d
@@ -0,0 +1,140 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 4C18D431FAF\r
+       for <notmuch@notmuchmail.org>; Fri, 12 Apr 2013 23:55:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, 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 qn-jWJJw9HSo for <notmuch@notmuchmail.org>;\r
+       Fri, 12 Apr 2013 23:55:43 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\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 C1A15431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 12 Apr 2013 23:55:42 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1UQuN3-0002sE-C2; Sat, 13 Apr 2013 07:55:35 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1UQuN3-0004Mq-38; Sat, 13 Apr 2013 07:55:33 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/1] emacs: fixed (declare-function ...) definitions\r
+In-Reply-To: <1365630175-1048-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1365630175-1048-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.14+255~gff3cc55 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 13 Apr 2013 07:55:50 +0100\r
+Message-ID: <87eheekjgp.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 5edd4fb3551830af940f6b21fc8b121a (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: tomi.ollila@iki.fi\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: Sat, 13 Apr 2013 06:55:44 -0000\r
+\r
+\r
+On Wed, 10 Apr 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> Some (declare-function ...) definitions were drifted away from the\r
+> actual (defun ...)'s. To find the drifts and to verify changes\r
+> the following command line was used:\r
+>\r
+> $ emacs --batch -L emacs --eval '(check-declare-directory "emacs")'\r
+\r
+This patch looks good to me +1.\r
+\r
+Is it worth making the above command into a test?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+>  emacs/notmuch-hello.el | 2 +-\r
+>  emacs/notmuch-show.el  | 1 -\r
+>  emacs/notmuch-wash.el  | 2 +-\r
+>  3 files changed, 2 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+> index cda79f1..c1c6f4b 100644\r
+> --- a/emacs/notmuch-hello.el\r
+> +++ b/emacs/notmuch-hello.el\r
+> @@ -26,7 +26,7 @@\r
+>  (require 'notmuch-lib)\r
+>  (require 'notmuch-mua)\r
+>  \r
+> -(declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation))\r
+> +(declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line continuation))\r
+>  (declare-function notmuch-poll "notmuch" ())\r
+>  \r
+>  (defcustom notmuch-hello-recent-searches-max 10\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index a4d2c12..face2a0 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -38,7 +38,6 @@\r
+>  (require 'notmuch-print)\r
+>  \r
+>  (declare-function notmuch-call-notmuch-process "notmuch" (&rest args))\r
+> -(declare-function notmuch-fontify-headers "notmuch" nil)\r
+>  (declare-function notmuch-search-next-thread "notmuch" nil)\r
+>  (declare-function notmuch-search-show-thread "notmuch" nil)\r
+>  \r
+> diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+> index 826b6f4..80c475c 100644\r
+> --- a/emacs/notmuch-wash.el\r
+> +++ b/emacs/notmuch-wash.el\r
+> @@ -23,7 +23,7 @@\r
+>  \r
+>  (require 'coolj)\r
+>  \r
+> -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth))\r
+> +(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
+>  \r
+>  ;;\r
+>  \r
+> -- \r
+> 1.8.0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r