--- /dev/null
+Return-Path: <xuchunyang.me@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 3759E6DE0355\r
+ for <notmuch@notmuchmail.org>; Wed, 13 Apr 2016 00:59:15 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.011\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.011 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.211,\r
+ SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id E3KRcFkkew_d for <notmuch@notmuchmail.org>;\r
+ Wed, 13 Apr 2016 00:59:06 -0700 (PDT)\r
+Received: from mail-pa0-f65.google.com (mail-pa0-f65.google.com\r
+ [209.85.220.65])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 2E4B26DE034D\r
+ for <notmuch@notmuchmail.org>; Wed, 13 Apr 2016 00:59:06 -0700 (PDT)\r
+Received: by mail-pa0-f65.google.com with SMTP id zy2so3300807pac.2\r
+ for <notmuch@notmuchmail.org>; Wed, 13 Apr 2016 00:59:06 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:mime-version\r
+ :content-transfer-encoding;\r
+ bh=cAMR2nikdEUbjMomVpTzL/vlJo1Mx6ioBxulyq6felE=;\r
+ b=j5m+nG7YIXYYp3uRc1isa/M08ENVcTFFsqV2Fk5D7eUTpTVAL1fcbvRgQB9pRRbKkn\r
+ U48IunqP4s5Rt6FI2bVNY8Tt9/gENPvKGnIlkgw3Q+OaruDeiJU7NhGcBRU5v2kAVT+I\r
+ /51/kUjXStWe9+V8nsRX6cjs9Eci95SIw/IC5QSX9J7fidHc39+qstkRPcEti7idsny7\r
+ Hgj5zqSFTE0vwgBYM+h4s/Q/h11BzbkVuDlhpIHNBihPvcy3gZ42XJxumBqvcqQ2sRPP\r
+ KKPyQrhJl/Q3SDTjADr8BIc1WgmTIAjLuJWo3HRkbTvOUm3Zz+D105h/TN2HyQortJG+\r
+ eKMQ==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\r
+ :content-transfer-encoding;\r
+ bh=cAMR2nikdEUbjMomVpTzL/vlJo1Mx6ioBxulyq6felE=;\r
+ b=WtX2s7i1/YcdsFxqo0Z7o9ZDRFM15llVUcigy1ZRb+6zEA1spe3gy+rifFgMtA6Km5\r
+ ZGsGjuV1XR1OVQcvAGigeI4MHqhjr8nHwlxIHphNRUZqg+E+jDLj52DrrlghDMPSbcuI\r
+ jKxYH80aiFB5938ThYDw2adyRXpMKME7qBylmaEmcNa0+9wadZAIjY66jhZwtq7/zrte\r
+ /NMV+AtTTUyUpj0yfh/d439zgl1p/PIUOAPNZb4bO14iJiPKXHBK+jU/95WJep3XNtau\r
+ wD5d7RhHJJdqgMlkYh7VQRK0rz1Ych79F0h8Ub4ozfx3vzQH6MmY+BLrPSks0ZwG3/kO\r
+ LIFA==\r
+X-Gm-Message-State:\r
+ AOPr4FW6hLfmeKrLQXDwiGjOAX+PToG2694+d4sXPCD5h/s+B2OWkY0R6fj5xpXN/Gvl+g==\r
+X-Received: by 10.66.193.131 with SMTP id ho3mr10900819pac.154.1460534345651; \r
+ Wed, 13 Apr 2016 00:59:05 -0700 (PDT)\r
+Received: from localhost.localdomain ([128.199.88.169])\r
+ by smtp.gmail.com with ESMTPSA id yj1sm48924434pac.16.2016.04.13.00.59.04\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\r
+ Wed, 13 Apr 2016 00:59:05 -0700 (PDT)\r
+From: Chunyang Xu <xuchunyang.me@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] emacs: Fix packaging\r
+Date: Wed, 13 Apr 2016 03:58:47 -0400\r
+Message-Id: <1460534328-31748-1-git-send-email-xuchunyang.me@gmail.com>\r
+X-Mailer: git-send-email 1.9.1\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 13 Apr 2016 07:59:15 -0000\r
+\r
+Refer to (info "(elisp) Library Headers") for package conventions.\r
+---\r
+ emacs/coolj.el | 2 ++\r
+ emacs/make-deps.el | 4 ++++\r
+ emacs/notmuch-address.el | 6 +++++-\r
+ emacs/notmuch-company.el | 4 +++-\r
+ emacs/notmuch-crypto.el | 6 +++++-\r
+ emacs/notmuch-hello.el | 6 +++++-\r
+ emacs/notmuch-jump.el | 6 +++++-\r
+ emacs/notmuch-lib.el | 6 +++++-\r
+ emacs/notmuch-maildir-fcc.el | 9 ++++++++-\r
+ emacs/notmuch-message.el | 6 +++++-\r
+ emacs/notmuch-mua.el | 6 +++++-\r
+ emacs/notmuch-parser.el | 6 +++++-\r
+ emacs/notmuch-print.el | 6 +++++-\r
+ emacs/notmuch-query.el | 6 +++++-\r
+ emacs/notmuch-show.el | 6 +++++-\r
+ emacs/notmuch-tag.el | 2 +-\r
+ emacs/notmuch-tree.el | 6 +++++-\r
+ emacs/notmuch-version.el.tmpl | 5 +++++\r
+ emacs/notmuch-wash.el | 6 +++++-\r
+ emacs/notmuch.el | 8 +++++++-\r
+ 20 files changed, 95 insertions(+), 17 deletions(-)\r
+\r
+diff --git a/emacs/coolj.el b/emacs/coolj.el\r
+index 60af60a..7755060 100644\r
+--- a/emacs/coolj.el\r
++++ b/emacs/coolj.el\r
+@@ -143,3 +143,5 @@ If no break point is found, return nil."\r
+ t)))\r
+ \r
+ (provide 'coolj)\r
++\r
++;;; coolj.el ends here\r
+diff --git a/emacs/make-deps.el b/emacs/make-deps.el\r
+index a1cd731..24c1a45 100644\r
+--- a/emacs/make-deps.el\r
++++ b/emacs/make-deps.el\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: Austin Clements <aclements@csail.mit.edu>\r
+ \r
++;;; Code:\r
++\r
+ (defun batch-make-deps ()\r
+ "Invoke `make-deps' for each file on the command line."\r
+ \r
+@@ -64,3 +66,5 @@ rules will be given relative to DIR, or `default-directory'."\r
+ (file-name-sans-extension\r
+ (file-relative-name fname dir)))))))))\r
+ (end-of-file nil))))\r
++\r
++;;; make-deps.el ends here\r
+diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el\r
+index 49e2402..aafbe5f 100644\r
+--- a/emacs/notmuch-address.el\r
++++ b/emacs/notmuch-address.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-address.el --- address completion with notmuch\r
++;;; notmuch-address.el --- address completion with notmuch\r
+ ;;\r
+ ;; Copyright © David Edmondson\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
++;;; Code:\r
++\r
+ (require 'message)\r
+ (require 'notmuch-parser)\r
+ (require 'notmuch-lib)\r
+@@ -248,3 +250,5 @@ called when harvesting finishes."\r
+ ;;\r
+ \r
+ (provide 'notmuch-address)\r
++\r
++;;; notmuch-address.el ends here\r
+diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el\r
+index add3161..b881d6d 100644\r
+--- a/emacs/notmuch-company.el\r
++++ b/emacs/notmuch-company.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-company.el --- Mail address completion for notmuch via company-mode -*- lexical-binding: t -*-\r
++;;; notmuch-company.el --- Mail address completion for notmuch via company-mode -*- lexical-binding: t -*-\r
+ \r
+ ;; Authors: Trevor Jim <tjim@mac.com>\r
+ ;; Michal Sojka <sojkam1@fel.cvut.cz>\r
+@@ -84,3 +84,5 @@\r
+ \r
+ \r
+ (provide 'notmuch-company)\r
++\r
++;;; notmuch-company.el ends here\r
+diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el\r
+index 73ebf51..004463c 100644\r
+--- a/emacs/notmuch-crypto.el\r
++++ b/emacs/notmuch-crypto.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-crypto.el --- functions for handling display of cryptographic metadata.\r
++;;; notmuch-crypto.el --- functions for handling display of cryptographic metadata.\r
+ ;;\r
+ ;; Copyright © Jameson Rollins\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: Jameson Rollins <jrollins@finestructure.net>\r
+ \r
++;;; Code:\r
++\r
+ (require 'notmuch-lib)\r
+ \r
+ (defcustom notmuch-crypto-process-mime nil\r
+@@ -174,3 +176,5 @@ mode."\r
+ ;;\r
+ \r
+ (provide 'notmuch-crypto)\r
++\r
++;;; notmuch-crypto.el ends here\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 8a31f9a..9495c1a 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-hello.el --- welcome to notmuch, a frontend\r
++;;; notmuch-hello.el --- welcome to notmuch, a frontend\r
+ ;;\r
+ ;; Copyright © David Edmondson\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
++;;; Code:\r
++\r
+ (eval-when-compile (require 'cl))\r
+ (require 'widget)\r
+ (require 'wid-edit) ; For `widget-forward'.\r
+@@ -1016,3 +1018,5 @@ following:\r
+ ;;\r
+ \r
+ (provide 'notmuch-hello)\r
++\r
++;;; notmuch-hello.el ends here\r
+diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el\r
+index 506ae2c..fd770f1 100644\r
+--- a/emacs/notmuch-jump.el\r
++++ b/emacs/notmuch-jump.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-jump.el --- User-friendly shortcut keys\r
++;;; notmuch-jump.el --- User-friendly shortcut keys\r
+ ;;\r
+ ;; Copyright © Austin Clements\r
+ ;;\r
+@@ -20,6 +20,8 @@\r
+ ;; Authors: Austin Clements <aclements@csail.mit.edu>\r
+ ;; David Edmondson <dme@dme.org>\r
+ \r
++;;; Code:\r
++\r
+ (eval-when-compile (require 'cl))\r
+ \r
+ (require 'notmuch-lib)\r
+@@ -176,3 +178,5 @@ buffer."\r
+ ;;\r
+ \r
+ (provide 'notmuch-jump)\r
++\r
++;;; notmuch-jump.el ends here\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index eca837d..78978ee 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-lib.el --- common variables, functions and function declarations\r
++;;; notmuch-lib.el --- common variables, functions and function declarations\r
+ ;;\r
+ ;; Copyright © Carl Worth\r
+ ;;\r
+@@ -21,6 +21,8 @@\r
+ \r
+ ;; This is an part of an emacs-based interface to the notmuch mail system.\r
+ \r
++;;; Code:\r
++\r
+ (require 'mm-view)\r
+ (require 'mm-decode)\r
+ (require 'cl)\r
+@@ -931,3 +933,5 @@ status."\r
+ ;; Local Variables:\r
+ ;; byte-compile-warnings: (not cl-functions)\r
+ ;; End:\r
++\r
++;;; notmuch-lib.el ends here\r
+diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el\r
+index c2f2f4c..bbf6132 100644\r
+--- a/emacs/notmuch-maildir-fcc.el\r
++++ b/emacs/notmuch-maildir-fcc.el\r
+@@ -1,3 +1,5 @@\r
++;;; notmuch-maildir-fcc.el ---\r
++\r
+ ;; This file is free software; you can redistribute it and/or modify\r
+ ;; it under the terms of the GNU General Public License as published\r
+ ;; by the Free Software Foundation; either version 2, or (at your\r
+@@ -12,10 +14,14 @@\r
+ ;; along with GNU Emacs; see the file COPYING. If not, write to the\r
+ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
+ ;; Boston, MA 02110-1301, USA.\r
+-;;\r
++\r
++;;; Commentary:\r
++\r
+ ;; To use this as the fcc handler for message-mode,\r
+ ;; customize the notmuch-fcc-dirs variable\r
+ \r
++;;; Code:\r
++\r
+ (eval-when-compile (require 'cl))\r
+ (require 'message)\r
+ \r
+@@ -211,3 +217,4 @@ return t if successful, and nil otherwise."\r
+ \r
+ (provide 'notmuch-maildir-fcc)\r
+ \r
++;;; notmuch-maildir-fcc.el ends here\r
+diff --git a/emacs/notmuch-message.el b/emacs/notmuch-message.el\r
+index 914bdd1..d437b85 100644\r
+--- a/emacs/notmuch-message.el\r
++++ b/emacs/notmuch-message.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-message.el --- message-mode functions specific to notmuch\r
++;;; notmuch-message.el --- message-mode functions specific to notmuch\r
+ ;;\r
+ ;; Copyright © Jesse Rosenthal\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: Jesse Rosenthal <jrosenthal@jhu.edu>\r
+ \r
++;;; Code:\r
++\r
+ (require 'message)\r
+ (require 'notmuch-tag)\r
+ (require 'notmuch-mua)\r
+@@ -46,3 +48,5 @@ the \"inbox\" and \"todo\" tags, you would set:\r
+ (add-hook 'message-send-hook 'notmuch-message-mark-replied)\r
+ \r
+ (provide 'notmuch-message)\r
++\r
++;;; notmuch-message.el ends here\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 935cbd3..3e5f887 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-mua.el --- emacs style mail-user-agent\r
++;;; notmuch-mua.el --- emacs style mail-user-agent\r
+ ;;\r
+ ;; Copyright © David Edmondson\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
++;;; Code:\r
++\r
+ (require 'message)\r
+ (require 'mm-view)\r
+ (require 'format-spec)\r
+@@ -513,3 +515,5 @@ simply runs the corresponding `message-mode' hook functions."\r
+ ;;\r
+ \r
+ (provide 'notmuch-mua)\r
++\r
++;;; notmuch-mua.el ends here\r
+diff --git a/emacs/notmuch-parser.el b/emacs/notmuch-parser.el\r
+index d59c0e1..620ca89 100644\r
+--- a/emacs/notmuch-parser.el\r
++++ b/emacs/notmuch-parser.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-parser.el --- streaming S-expression parser\r
++;;; notmuch-parser.el --- streaming S-expression parser\r
+ ;;\r
+ ;; Copyright © Austin Clements\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: Austin Clements <aclements@csail.mit.edu>\r
+ \r
++;;; Code:\r
++\r
+ (require 'cl)\r
+ \r
+ (defun notmuch-sexp-create-parser ()\r
+@@ -205,3 +207,5 @@ move point in the input buffer."\r
+ ;; Local Variables:\r
+ ;; byte-compile-warnings: (not cl-functions)\r
+ ;; End:\r
++\r
++;;; notmuch-parser.el ends here\r
+diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el\r
+index 8c18f4b..480a0cf 100644\r
+--- a/emacs/notmuch-print.el\r
++++ b/emacs/notmuch-print.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-print.el --- printing messages from notmuch.\r
++;;; notmuch-print.el --- printing messages from notmuch.\r
+ ;;\r
+ ;; Copyright © David Edmondson\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
++;;; Code:\r
++\r
+ (require 'notmuch-lib)\r
+ \r
+ (declare-function notmuch-show-get-prop "notmuch-show" (prop &optional props))\r
+@@ -90,3 +92,5 @@ Optional OUTPUT allows passing a list of flags to muttprint."\r
+ (funcall notmuch-print-mechanism msg))\r
+ \r
+ (provide 'notmuch-print)\r
++\r
++;;; notmuch-print.el ends here\r
+diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el\r
+index d1daffc..8587d88 100644\r
+--- a/emacs/notmuch-query.el\r
++++ b/emacs/notmuch-query.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-query.el --- provide an emacs api to query notmuch\r
++;;; notmuch-query.el --- provide an emacs api to query notmuch\r
+ ;;\r
+ ;; Copyright © David Bremner\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: David Bremner <david@tethera.net>\r
+ \r
++;;; Code:\r
++\r
+ (require 'notmuch-lib)\r
+ \r
+ (defun notmuch-query-get-threads (search-terms)\r
+@@ -74,3 +76,5 @@ See the function notmuch-query-get-threads for more information."\r
+ (notmuch-query-get-threads search-terms)))\r
+ \r
+ (provide 'notmuch-query)\r
++\r
++;;; notmuch-query.el ends here\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 46e3869..5d9b7b4 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-show.el --- displaying notmuch forests.\r
++;;; notmuch-show.el --- displaying notmuch forests.\r
+ ;;\r
+ ;; Copyright © Carl Worth\r
+ ;; Copyright © David Edmondson\r
+@@ -21,6 +21,8 @@\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ ;; David Edmondson <dme@dme.org>\r
+ \r
++;;; Code:\r
++\r
+ (eval-when-compile (require 'cl))\r
+ (require 'mm-view)\r
+ (require 'message)\r
+@@ -2379,3 +2381,5 @@ is destroyed when FN returns."\r
+ \r
+ \r
+ (provide 'notmuch-show)\r
++\r
++;;; notmuch-show.el ends here\r
+diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+index c7f62c9..98064a3 100644\r
+--- a/emacs/notmuch-tag.el\r
++++ b/emacs/notmuch-tag.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-tag.el --- tag messages within emacs\r
++;;; notmuch-tag.el --- tag messages within emacs\r
+ ;;\r
+ ;; Copyright © Damien Cassou\r
+ ;; Copyright © Carl Worth\r
+diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el\r
+index 384cb76..4f9ca2d 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-tree.el --- displaying notmuch forests.\r
++;;; notmuch-tree.el --- displaying notmuch forests.\r
+ ;;\r
+ ;; Copyright © Carl Worth\r
+ ;; Copyright © David Edmondson\r
+@@ -22,6 +22,8 @@\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ ;; Mark Walters <markwalters1009@gmail.com>\r
+ \r
++;;; Code:\r
++\r
+ (require 'mail-parse)\r
+ \r
+ (require 'notmuch-lib)\r
+@@ -945,3 +947,5 @@ The arguments are:\r
+ ;;\r
+ \r
+ (provide 'notmuch-tree)\r
++\r
++;;; notmuch-tree.el ends here\r
+diff --git a/emacs/notmuch-version.el.tmpl b/emacs/notmuch-version.el.tmpl\r
+index 236aaf7..88cc01c 100644\r
+--- a/emacs/notmuch-version.el.tmpl\r
++++ b/emacs/notmuch-version.el.tmpl\r
+@@ -1,3 +1,4 @@\r
++;;; notmuch-version.el --- Version of notmuch\r
+ ;; -*- emacs-lisp -*-\r
+ ;;\r
+ ;; %AG%\r
+@@ -17,7 +18,11 @@\r
+ ;; You should have received a copy of the GNU General Public License\r
+ ;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
+ \r
++;;; Code:\r
++\r
+ (defconst notmuch-emacs-version %VERSION%\r
+ "Version of Notmuch Emacs MUA.")\r
+ \r
+ (provide 'notmuch-version)\r
++\r
++;;; notmuch-version.el ends here\r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index a76b4f5..065af16 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch-wash.el --- cleaning up message bodies\r
++;;; notmuch-wash.el --- cleaning up message bodies\r
+ ;;\r
+ ;; Copyright © Carl Worth\r
+ ;; Copyright © David Edmondson\r
+@@ -21,6 +21,8 @@\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ ;; David Edmondson <dme@dme.org>\r
+ \r
++;;; Code:\r
++\r
+ (require 'coolj)\r
+ \r
+ (declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
+@@ -423,3 +425,5 @@ for error."\r
+ ;;\r
+ \r
+ (provide 'notmuch-wash)\r
++\r
++;;; notmuch-wash.el ends here\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 060af8e..b45b5ec 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -1,4 +1,4 @@\r
+-;; notmuch.el --- run notmuch within emacs\r
++;;; notmuch.el --- run notmuch within emacs\r
+ ;;\r
+ ;; Copyright © Carl Worth\r
+ ;;\r
+@@ -19,6 +19,8 @@\r
+ ;;\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ \r
++;;; Commentary:\r
++\r
+ ;; This is an emacs-based interface to the notmuch mail system.\r
+ ;;\r
+ ;; You will first need to have the notmuch program installed and have a\r
+@@ -47,6 +49,8 @@\r
+ ;; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not\r
+ ;; required, but is available from http://notmuchmail.org).\r
+ \r
++;;; Code:\r
++\r
+ (eval-when-compile (require 'cl))\r
+ (require 'mm-view)\r
+ (require 'message)\r
+@@ -1064,3 +1068,5 @@ notmuch buffers exist, run `notmuch'."\r
+ (let ((init-file (locate-file notmuch-init-file '("/")\r
+ (get-load-suffixes))))\r
+ (if init-file (load init-file nil t t))))\r
++\r
++;;; notmuch.el ends here\r
+-- \r
+2.8.0\r
+\r