--- /dev/null
+Return-Path: <too@guru.guru-group.fi>\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 A1287431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Jan 2012 06:44:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 ltAqW3DJBQeF for <notmuch@notmuchmail.org>;\r
+ Sat, 21 Jan 2012 06:44:28 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])\r
+ by olra.theworths.org (Postfix) with ESMTP id 836A2431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Jan 2012 06:44:27 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 4319668056; Sat, 21 Jan 2012 16:44:30 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: <notmuch@notmuchmail.org>\r
+Subject: [PATCH] emacs/*.el: changed one-char comment prefix ';' to two; ';;'\r
+Date: Sat, 21 Jan 2012 16:44:28 +0200\r
+Message-Id: <1327157068-21378-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.7.6.1\r
+In-Reply-To: <id:"1326704656-26102-1-git-send-email-tomi.ollila@iki.fi">\r
+References: <id:"1326704656-26102-1-git-send-email-tomi.ollila@iki.fi">\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+Cc: Tomi Ollila <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, 21 Jan 2012 14:44:29 -0000\r
+\r
+In order for emacs (indent-region) to (re)indent emacs lisp\r
+properly there needs to be at least 2 comment characters (;;).\r
+---\r
+\r
+resubmitted as the old patch does not apply cleanly anymore.\r
+\r
+ emacs/notmuch-hello.el | 4 +-\r
+ emacs/notmuch-lib.el | 16 +++---\r
+ emacs/notmuch-show.el | 16 +++---\r
+ emacs/notmuch.el | 118 ++++++++++++++++++++++++------------------------\r
+ 4 files changed, 77 insertions(+), 77 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 1a61768..63f2e07 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -402,8 +402,8 @@ Complete list of currently available key bindings:\r
+ "Run notmuch and display saved searches, known tags, etc."\r
+ (interactive)\r
+ \r
+- ; Jump through a hoop to get this value from the deprecated variable\r
+- ; name (`notmuch-folders') or from the default value.\r
++ ;; Jump through a hoop to get this value from the deprecated variable\r
++ ;; name (`notmuch-folders') or from the default value.\r
+ (unless notmuch-saved-searches\r
+ (setq notmuch-saved-searches (notmuch-saved-searches)))\r
+ \r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index e33e69a..241fe8c 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -148,14 +148,14 @@ the user hasn't set this variable with the old or new value."\r
+ (setq list (cdr list)))\r
+ (nreverse out)))\r
+ \r
+-; This lets us avoid compiling these replacement functions when emacs\r
+-; is sufficiently new enough to supply them alone. We do the macro\r
+-; treatment rather than just wrapping our defun calls in a when form\r
+-; specifically so that the compiler never sees the code on new emacs,\r
+-; (since the code is triggering warnings that we don't know how to get\r
+-; rid of.\r
+-;\r
+-; A more clever macro here would accept a condition and a list of forms.\r
++;; This lets us avoid compiling these replacement functions when emacs\r
++;; is sufficiently new enough to supply them alone. We do the macro\r
++;; treatment rather than just wrapping our defun calls in a when form\r
++;; specifically so that the compiler never sees the code on new emacs,\r
++;; (since the code is triggering warnings that we don't know how to get\r
++;; rid of.\r
++;;\r
++;; A more clever macro here would accept a condition and a list of forms.\r
+ (defmacro compile-on-emacs-prior-to-23 (form)\r
+ "Conditionally evaluate form only on emacs < emacs-23."\r
+ (list 'when (< emacs-major-version 23)\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 3fb13ab..e6a5b31 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -137,14 +137,14 @@ indentation."\r
+ "Use external viewers to view all attachments from the current message."\r
+ (interactive)\r
+ (with-current-notmuch-show-message\r
+- ; We override the mm-inline-media-tests to indicate which message\r
+- ; parts are already sufficiently handled by the original\r
+- ; presentation of the message in notmuch-show mode. These parts\r
+- ; will be inserted directly into the temporary buffer of\r
+- ; with-current-notmuch-show-message and silently discarded.\r
+- ;\r
+- ; Any MIME part not explicitly mentioned here will be handled by an\r
+- ; external viewer as configured in the various mailcap files.\r
++ ;; We override the mm-inline-media-tests to indicate which message\r
++ ;; parts are already sufficiently handled by the original\r
++ ;; presentation of the message in notmuch-show mode. These parts\r
++ ;; will be inserted directly into the temporary buffer of\r
++ ;; with-current-notmuch-show-message and silently discarded.\r
++ ;;\r
++ ;; Any MIME part not explicitly mentioned here will be handled by an\r
++ ;; external viewer as configured in the various mailcap files.\r
+ (let ((mm-inline-media-tests '(\r
+ ("text/.*" ignore identity)\r
+ ("application/pgp-signature" ignore identity)\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index da75faf..6b2c252 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -1,51 +1,51 @@\r
+-; notmuch.el --- run notmuch within emacs\r
+-;\r
+-; Copyright © Carl Worth\r
+-;\r
+-; This file is part of Notmuch.\r
+-;\r
+-; Notmuch is free software: you can redistribute it and/or modify it\r
+-; under the terms of the GNU General Public License as published by\r
+-; the Free Software Foundation, either version 3 of the License, or\r
+-; (at your option) any later version.\r
+-;\r
+-; Notmuch is distributed in the hope that it will be useful, but\r
+-; WITHOUT ANY WARRANTY; without even the implied warranty of\r
+-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
+-; General Public License for more details.\r
+-;\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
+-; Authors: Carl Worth <cworth@cworth.org>\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
+-; notmuch database built in order to use this. See\r
+-; http://notmuchmail.org for details.\r
+-;\r
+-; To install this software, copy it to a directory that is on the\r
+-; `load-path' variable within emacs (a good candidate is\r
+-; /usr/local/share/emacs/site-lisp). If you are viewing this from the\r
+-; notmuch source distribution then you can simply run:\r
+-;\r
+-; sudo make install-emacs\r
+-;\r
+-; to install it.\r
+-;\r
+-; Then, to actually run it, add:\r
+-;\r
+-; (require 'notmuch)\r
+-;\r
+-; to your ~/.emacs file, and then run "M-x notmuch" from within emacs,\r
+-; or run:\r
+-;\r
+-; emacs -f notmuch\r
+-;\r
+-; Have fun, and let us know if you have any comment, questions, or\r
+-; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not\r
+-; required, but is available from http://notmuchmail.org).\r
++;; notmuch.el --- run notmuch within emacs\r
++;;\r
++;; Copyright © Carl Worth\r
++;;\r
++;; This file is part of Notmuch.\r
++;;\r
++;; Notmuch is free software: you can redistribute it and/or modify it\r
++;; under the terms of the GNU General Public License as published by\r
++;; the Free Software Foundation, either version 3 of the License, or\r
++;; (at your option) any later version.\r
++;;\r
++;; Notmuch is distributed in the hope that it will be useful, but\r
++;; WITHOUT ANY WARRANTY; without even the implied warranty of\r
++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
++;; General Public License for more details.\r
++;;\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
++;; Authors: Carl Worth <cworth@cworth.org>\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
++;; notmuch database built in order to use this. See\r
++;; http://notmuchmail.org for details.\r
++;;\r
++;; To install this software, copy it to a directory that is on the\r
++;; `load-path' variable within emacs (a good candidate is\r
++;; /usr/local/share/emacs/site-lisp). If you are viewing this from the\r
++;; notmuch source distribution then you can simply run:\r
++;;\r
++;; sudo make install-emacs\r
++;;\r
++;; to install it.\r
++;;\r
++;; Then, to actually run it, add:\r
++;;\r
++;; (require 'notmuch)\r
++;;\r
++;; to your ~/.emacs file, and then run "M-x notmuch" from within emacs,\r
++;; or run:\r
++;;\r
++;; emacs -f notmuch\r
++;;\r
++;; Have fun, and let us know if you have any comment, questions, or\r
++;; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not\r
++;; required, but is available from http://notmuchmail.org).\r
+ \r
+ (eval-when-compile (require 'cl))\r
+ (require 'mm-view)\r
+@@ -139,10 +139,10 @@ This is basically just `format-kbd-macro' but we also convert ESC to M-."\r
+ "M-"\r
+ (concat desc " "))))\r
+ \r
+-; I would think that emacs would have code handy for walking a keymap\r
+-; and generating strings for each key, and I would prefer to just call\r
+-; that. But I couldn't find any (could be all implemented in C I\r
+-; suppose), so I wrote my own here.\r
++;; I would think that emacs would have code handy for walking a keymap\r
++;; and generating strings for each key, and I would prefer to just call\r
++;; that. But I couldn't find any (could be all implemented in C I\r
++;; suppose), so I wrote my own here.\r
+ (defun notmuch-substitute-one-command-key-with-prefix (prefix binding)\r
+ "For a key binding, return a string showing a human-readable\r
+ representation of the prefixed key as well as the first line of\r
+@@ -271,14 +271,14 @@ For a mouse binding, return nil."\r
+ (defun notmuch-search-scroll-down ()\r
+ "Move backward through the search results by one window's worth."\r
+ (interactive)\r
+- ; I don't know why scroll-down doesn't signal beginning-of-buffer\r
+- ; the way that scroll-up signals end-of-buffer, but c'est la vie.\r
+- ;\r
+- ; So instead of trapping a signal we instead check whether the\r
+- ; window begins on the first line of the buffer and if so, move\r
+- ; directly to that position. (We have to count lines since the\r
+- ; window-start position is not the same as point-min due to the\r
+- ; invisible thread-ID characters on the first line.\r
++ ;; I don't know why scroll-down doesn't signal beginning-of-buffer\r
++ ;; the way that scroll-up signals end-of-buffer, but c'est la vie.\r
++ ;;\r
++ ;; So instead of trapping a signal we instead check whether the\r
++ ;; window begins on the first line of the buffer and if so, move\r
++ ;; directly to that position. (We have to count lines since the\r
++ ;; window-start position is not the same as point-min due to the\r
++ ;; invisible thread-ID characters on the first line.\r
+ (if (equal (count-lines (point-min) (window-start)) 0)\r
+ (goto-char (point-min))\r
+ (scroll-down nil)))\r
+-- \r
+1.7.6.1\r
+\r
projects / notmuch-archives.git / commitdiff