Re: [PATCH] Set fill column to 70 in .dir-locals.el and refactor other settings.

diff --git a/6b/5899fcb2a6eda017a9c0cc817e94479e108313 b/6b/5899fcb2a6eda017a9c0cc817e94479e108313
new file mode 100644 (file)
index 0000000..a649012
--- /dev/null
+++ b/6b/5899fcb2a6eda017a9c0cc817e94479e108313
@@ -0,0 +1,134 @@
+Return-Path: <amdragon@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 320D8429E47\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 14:54: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 CAYIdw8fZxIR for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jan 2012 14:54:54 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 95A87429E3F\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 14:54:54 -0800 (PST)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-5f-4f10b63d784b\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id FC.32.02272.D36B01F4; Fri, 13 Jan 2012 17:54:54 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q0DMsrnc007316; \r
+       Fri, 13 Jan 2012 17:54:53 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (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 q0DMspwZ026059\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 13 Jan 2012 17:54:52 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1Rlq1L-00009w-BT; Fri, 13 Jan 2012 17:54:51 -0500\r
+Date: Fri, 13 Jan 2012 17:54:51 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Xavier Maillard <xma@gnu.org>\r
+Subject: Re: [PATCH] Set fill column to 70 in .dir-locals.el and refactor\r
+       other settings.\r
+Message-ID: <20120113225451.GK18625@mit.edu>\r
+References: <1326410243-22277-1-git-send-email-amdragon@mit.edu>\r
+       <m2lipb6alj.fsf@kcals.intra.maillard.im>\r
+       <m27h0v5imm.fsf@kcals.intra.maillard.im>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <m27h0v5imm.fsf@kcals.intra.maillard.im>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFupjleLIzCtJLcpLzFFi42IR4hTV1rXbJuBv0HWR0eL6zZnMFo/a97M7\r
+       MHm0TTPzeLbqFnMAUxSXTUpqTmZZapG+XQJXxubvfxkLXvNVTNz8i6mB8QJ3FyMnh4SAicT5\r
+       Q2+YIGwxiQv31rN1MXJxCAnsY5R43reMEcLZwCixbeMeqMxJJomdEw6xQjhLGCUmzXkI5HBw\r
+       sAioSpy7wQcyik1AQ2Lb/uWMILaIgKLEgU372EBsZgFpiW+/m5lAyoUFoiW6tmmDhHkFdCRe\r
+       vLzEDDFyGqPE3P09LBAJQYmTM5+wQPRqSdz49xKsF2TO8n8cIGFOAVOJb+sOgI0XFVCRmHJy\r
+       G9sERqFZSLpnIemehdC9gJF5FaNsSm6Vbm5iZk5xarJucXJiXl5qka6FXm5miV5qSukmRlBQ\r
+       s7uo7mCccEjpEKMAB6MSD69kloC/EGtiWXFl7iFGSQ4mJVFelq1AIb6k/JTKjMTijPii0pzU\r
+       4kOMEhzMSiK8UqZAOd6UxMqq1KJ8mJQ0B4uSOK+m1js/IYH0xJLU7NTUgtQimKwMB4eSBO9O\r
+       kKGCRanpqRVpmTklCGkmDk6Q4TxAw7eA1PAWFyTmFmemQ+RPMepynFx75RyjEEtefl6qlDhv\r
+       G0iRAEhRRmke3BxYMnrFKA70ljBvJUgVDzCRwU16BbSECWhJWQofyJKSRISUVAPjspqYmf+m\r
+       pnw+8Cg2WHHitEOz+eJUnlxc4CCl9VJo0cZtjRt7Tcs/f77l+vjCTR/TOU1hD6xfBgkd6voy\r
+       7feh6T29P0/dfbqxqWoPMKw/G9/ckJireGNuZKvD6VKXj08zd6Vc2apm++PKvD8B2z/es5ht\r
+       O6Fa79a0BKlVblNiS6MlnI+su1pirsRSnJFoqMVcVJwIAKkjO+whAwAA\r
+Cc: notmuch@notmuchmail.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: Fri, 13 Jan 2012 22:54:55 -0000\r
+\r
+Quoth Xavier Maillard on Jan 13 at 11:42 pm:\r
+> \r
+> This controls where comments and other text wraps.  70 is the default\r
+> value, so this simply returns it to the default for people who have\r
+> overridden it.  Most notmuch code already adheres to this.\r
+> ---\r
+> SO here is the patch (still sorry if I did it wrongly and very badly).\r
+> \r
+>  .dir-locals.el |   19 ++++++-------------\r
+>  1 files changed, 6 insertions(+), 13 deletions(-)\r
+> \r
+> diff --git a/.dir-locals.el b/.dir-locals.el\r
+> index aea630b..27f01c0 100644\r
+> --- a/.dir-locals.el\r
+> +++ b/.dir-locals.el\r
+> @@ -1,23 +1,16 @@\r
+> -; emacs local configuration settings for notmuch source\r
+> -; surmised by dkg on 2010-11-23 13:43:18-0500\r
+> -; amended by amdragon on 2011-06-06\r
+> +;; emacs local configuration settings for notmuch source\r
+> +;; surmised by dkg on 2010-11-23 13:43:18-0500\r
+> +;; amended by amdragon on 2011-06-06\r
+>  \r
+> -((c-mode\r
+> +((nil\r
+>    (indent-tabs-mode . t)\r
+>    (tab-width . 8)\r
+>    (c-basic-offset . 4)\r
+> +  (fill-column . 70))\r
+> + (c-mode\r
+>    (c-file-style . "linux"))\r
+>   (c++-mode\r
+> -  (indent-tabs-mode . t)\r
+> -  (tab-width . 8)\r
+> -  (c-basic-offset . 4)\r
+>    (c-file-style . "linux"))\r
+> - (emacs-lisp-mode\r
+> -  (indent-tabs-mode . t)\r
+> -  (tab-width . 8))\r
+>   (shell-mode\r
+> -  (indent-tabs-mode . t)\r
+> -  (tab-width . 8)\r
+> -  (sh-basic-offset . 4)\r
+>    (sh-indentation . 4))\r
+>   )\r
+\r
+You ammended it right, but actually the configuration is intentionally\r
+repeated for the various modes.  For some programming languages\r
+(notably Python), it's inappropriate to mess with the tab settings\r
+(especially indent-tabs-mode), hence I took a "whitelist" approach to\r
+be on the safe side, rather than using global settings and then\r
+enumerating the modes I happened to know would break.\r
+\r
+This is admittedly subtle.  There should probably be a comment in the\r
+file explaining this.\r