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