[PATCH v2 1/4] emacs: Fix out-of-date declare-function

diff --git a/48/077b78d3c4bdd1d0c5f99400a0d9995a725adc b/48/077b78d3c4bdd1d0c5f99400a0d9995a725adc
new file mode 100644 (file)
index 0000000..26a63a8
--- /dev/null
+++ b/48/077b78d3c4bdd1d0c5f99400a0d9995a725adc
@@ -0,0 +1,96 @@
+Return-Path: <amthrax@drake.mit.edu>\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 03E8D431FCF\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 10:02:55 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 iwM86disuCZi for <notmuch@notmuchmail.org>;\r
+       Sun, 19 Feb 2012 10:02:54 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+       [18.7.68.35])\r
+       by olra.theworths.org (Postfix) with ESMTP id BA16E431FC0\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 10:02:53 -0800 (PST)\r
+X-AuditID: 12074423-b7f9c6d0000008c3-13-4f41394d28be\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 69.27.02243.D49314F4; Sun, 19 Feb 2012 13:02:53 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q1JI2qum024101; \r
+       Sun, 19 Feb 2012 13:02:52 -0500\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1JI2l9B013400\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 19 Feb 2012 13:02:52 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1RzB5z-0007Me-4z; Sun, 19 Feb 2012 13:02:47 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/4] emacs: Fix out-of-date declare-function\r
+Date: Sun, 19 Feb 2012 13:02:40 -0500\r
+Message-Id: <1329674563-28223-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329674563-28223-1-git-send-email-amdragon@mit.edu>\r
+References: <1329632533-16152-1-git-send-email-amdragon@mit.edu>\r
+       <1329674563-28223-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6nrutr6ehvcHE6n8X1mzOZLd6snMfq\r
+       wORx+OtCFo9nq24xBzBFcdmkpOZklqUW6dslcGVcv3aGuaCNrWLahdMsDYx9rF2MnBwSAiYS\r
+       kz9tYYGwxSQu3FvP1sXIxSEksI9R4vz1W8wQzgZGiYMbZzBBOPeZJJ5vX8sO4cxnlPh6/Csb\r
+       SD+bgIbEtv3LGUFsEQFpiZ13Z4PtYBawkjh8dROYLSxgL9HftxpsH4uAqsTxd/fB4rwCDhKr\r
+       bkxjgrhDQeLc6nNACzg4OAUcJS7+swMJCwmUS8z98JZ5AiP/AkaGVYyyKblVurmJmTnFqcm6\r
+       xcmJeXmpRbpmermZJXqpKaWbGMGh5KK8g/HPQaVDjAIcjEo8vFJlDv5CrIllxZW5hxglOZiU\r
+       RHl5zB39hfiS8lMqMxKLM+KLSnNSiw8xSnAwK4nwlt609xfiTUmsrEotyodJSXOwKInzami9\r
+       8xMSSE8sSc1OTS1ILYLJynBwKEnwOlsADRUsSk1PrUjLzClBSDNxcIIM5wEarg5Sw1tckJhb\r
+       nJkOkT/FqCglzqsHkhAASWSU5sH1wmL9FaM40CvCvGYgVTzANAHX/QpoMBPQYF4hO5DBJYkI\r
+       KakGRlcTlalLTJQ71Tku3OZ3f3I7nG/mgW3mK97dVhEU2LlmVnX1yyuOhxPMnNm8jx6r6wko\r
+       eLC67sS3z63ZhTYG1/frSC7W0Xh6Rmsr8/cPVqnCC+f3JP74m+x3aHNNH7vrPp9wRZ+t9swr\r
+       2lPPXFrHNPsYm4PA5i3Pny2VbrsbJuf7wfWtobPOOiWW4oxEQy3mouJEANNqiR7QAgAA\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: Sun, 19 Feb 2012 18:02:55 -0000\r
+\r
+The names of the arguments to notmuch-show-refresh-view had gotten out\r
+of sync between the declare-function and the real thing.\r
+---\r
+ emacs/notmuch-crypto.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el\r
+index c7ef1eb..972f26e 100644\r
+--- a/emacs/notmuch-crypto.el\r
++++ b/emacs/notmuch-crypto.el\r
+@@ -120,7 +120,7 @@ mode."\r
+      :notmuch-from from)\r
+     (insert "\n")))\r
+ \r
+-(declare-function notmuch-show-refresh-view "notmuch-show" (&optional crypto-switch))\r
++(declare-function notmuch-show-refresh-view "notmuch-show" (&optional retain-state))\r
+ \r
+ (defun notmuch-crypto-sigstatus-good-callback (button)\r
+   (let* ((sigstatus (button-get button :notmuch-sigstatus))\r
+-- \r
+1.7.7.3\r
+\r