1 Return-Path: <too@guru.guru-group.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id A1287431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 21 Jan 2012 06:44:29 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id ltAqW3DJBQeF for <notmuch@notmuchmail.org>;
\r
16 Sat, 21 Jan 2012 06:44:28 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 836A2431FAE
\r
19 for <notmuch@notmuchmail.org>; Sat, 21 Jan 2012 06:44:27 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 4319668056; Sat, 21 Jan 2012 16:44:30 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: <notmuch@notmuchmail.org>
\r
24 Subject: [PATCH] emacs/*.el: changed one-char comment prefix ';' to two; ';;'
\r
25 Date: Sat, 21 Jan 2012 16:44:28 +0200
\r
26 Message-Id: <1327157068-21378-1-git-send-email-tomi.ollila@iki.fi>
\r
27 X-Mailer: git-send-email 1.7.6.1
\r
28 In-Reply-To: <id:"1326704656-26102-1-git-send-email-tomi.ollila@iki.fi">
\r
29 References: <id:"1326704656-26102-1-git-send-email-tomi.ollila@iki.fi">
\r
31 Content-Type: text/plain; charset=UTF-8
\r
32 Content-Transfer-Encoding: 8bit
\r
33 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
34 X-BeenThere: notmuch@notmuchmail.org
\r
35 X-Mailman-Version: 2.1.13
\r
37 List-Id: "Use and development of the notmuch mail system."
\r
38 <notmuch.notmuchmail.org>
\r
39 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
41 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
42 List-Post: <mailto:notmuch@notmuchmail.org>
\r
43 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
44 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
46 X-List-Received-Date: Sat, 21 Jan 2012 14:44:29 -0000
\r
48 In order for emacs (indent-region) to (re)indent emacs lisp
\r
49 properly there needs to be at least 2 comment characters (;;).
\r
52 resubmitted as the old patch does not apply cleanly anymore.
\r
54 emacs/notmuch-hello.el | 4 +-
\r
55 emacs/notmuch-lib.el | 16 +++---
\r
56 emacs/notmuch-show.el | 16 +++---
\r
57 emacs/notmuch.el | 118 ++++++++++++++++++++++++------------------------
\r
58 4 files changed, 77 insertions(+), 77 deletions(-)
\r
60 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
61 index 1a61768..63f2e07 100644
\r
62 --- a/emacs/notmuch-hello.el
\r
63 +++ b/emacs/notmuch-hello.el
\r
64 @@ -402,8 +402,8 @@ Complete list of currently available key bindings:
\r
65 "Run notmuch and display saved searches, known tags, etc."
\r
68 - ; Jump through a hoop to get this value from the deprecated variable
\r
69 - ; name (`notmuch-folders') or from the default value.
\r
70 + ;; Jump through a hoop to get this value from the deprecated variable
\r
71 + ;; name (`notmuch-folders') or from the default value.
\r
72 (unless notmuch-saved-searches
\r
73 (setq notmuch-saved-searches (notmuch-saved-searches)))
\r
75 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
76 index e33e69a..241fe8c 100644
\r
77 --- a/emacs/notmuch-lib.el
\r
78 +++ b/emacs/notmuch-lib.el
\r
79 @@ -148,14 +148,14 @@ the user hasn't set this variable with the old or new value."
\r
80 (setq list (cdr list)))
\r
83 -; This lets us avoid compiling these replacement functions when emacs
\r
84 -; is sufficiently new enough to supply them alone. We do the macro
\r
85 -; treatment rather than just wrapping our defun calls in a when form
\r
86 -; specifically so that the compiler never sees the code on new emacs,
\r
87 -; (since the code is triggering warnings that we don't know how to get
\r
90 -; A more clever macro here would accept a condition and a list of forms.
\r
91 +;; This lets us avoid compiling these replacement functions when emacs
\r
92 +;; is sufficiently new enough to supply them alone. We do the macro
\r
93 +;; treatment rather than just wrapping our defun calls in a when form
\r
94 +;; specifically so that the compiler never sees the code on new emacs,
\r
95 +;; (since the code is triggering warnings that we don't know how to get
\r
98 +;; A more clever macro here would accept a condition and a list of forms.
\r
99 (defmacro compile-on-emacs-prior-to-23 (form)
\r
100 "Conditionally evaluate form only on emacs < emacs-23."
\r
101 (list 'when (< emacs-major-version 23)
\r
102 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
103 index 3fb13ab..e6a5b31 100644
\r
104 --- a/emacs/notmuch-show.el
\r
105 +++ b/emacs/notmuch-show.el
\r
106 @@ -137,14 +137,14 @@ indentation."
\r
107 "Use external viewers to view all attachments from the current message."
\r
109 (with-current-notmuch-show-message
\r
110 - ; We override the mm-inline-media-tests to indicate which message
\r
111 - ; parts are already sufficiently handled by the original
\r
112 - ; presentation of the message in notmuch-show mode. These parts
\r
113 - ; will be inserted directly into the temporary buffer of
\r
114 - ; with-current-notmuch-show-message and silently discarded.
\r
116 - ; Any MIME part not explicitly mentioned here will be handled by an
\r
117 - ; external viewer as configured in the various mailcap files.
\r
118 + ;; We override the mm-inline-media-tests to indicate which message
\r
119 + ;; parts are already sufficiently handled by the original
\r
120 + ;; presentation of the message in notmuch-show mode. These parts
\r
121 + ;; will be inserted directly into the temporary buffer of
\r
122 + ;; with-current-notmuch-show-message and silently discarded.
\r
124 + ;; Any MIME part not explicitly mentioned here will be handled by an
\r
125 + ;; external viewer as configured in the various mailcap files.
\r
126 (let ((mm-inline-media-tests '(
\r
127 ("text/.*" ignore identity)
\r
128 ("application/pgp-signature" ignore identity)
\r
129 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
130 index da75faf..6b2c252 100644
\r
131 --- a/emacs/notmuch.el
\r
132 +++ b/emacs/notmuch.el
\r
134 -; notmuch.el --- run notmuch within emacs
\r
136 -; Copyright © Carl Worth
\r
138 -; This file is part of Notmuch.
\r
140 -; Notmuch is free software: you can redistribute it and/or modify it
\r
141 -; under the terms of the GNU General Public License as published by
\r
142 -; the Free Software Foundation, either version 3 of the License, or
\r
143 -; (at your option) any later version.
\r
145 -; Notmuch is distributed in the hope that it will be useful, but
\r
146 -; WITHOUT ANY WARRANTY; without even the implied warranty of
\r
147 -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
148 -; General Public License for more details.
\r
150 -; You should have received a copy of the GNU General Public License
\r
151 -; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.
\r
153 -; Authors: Carl Worth <cworth@cworth.org>
\r
155 -; This is an emacs-based interface to the notmuch mail system.
\r
157 -; You will first need to have the notmuch program installed and have a
\r
158 -; notmuch database built in order to use this. See
\r
159 -; http://notmuchmail.org for details.
\r
161 -; To install this software, copy it to a directory that is on the
\r
162 -; `load-path' variable within emacs (a good candidate is
\r
163 -; /usr/local/share/emacs/site-lisp). If you are viewing this from the
\r
164 -; notmuch source distribution then you can simply run:
\r
166 -; sudo make install-emacs
\r
170 -; Then, to actually run it, add:
\r
172 -; (require 'notmuch)
\r
174 -; to your ~/.emacs file, and then run "M-x notmuch" from within emacs,
\r
177 -; emacs -f notmuch
\r
179 -; Have fun, and let us know if you have any comment, questions, or
\r
180 -; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not
\r
181 -; required, but is available from http://notmuchmail.org).
\r
182 +;; notmuch.el --- run notmuch within emacs
\r
184 +;; Copyright © Carl Worth
\r
186 +;; This file is part of Notmuch.
\r
188 +;; Notmuch is free software: you can redistribute it and/or modify it
\r
189 +;; under the terms of the GNU General Public License as published by
\r
190 +;; the Free Software Foundation, either version 3 of the License, or
\r
191 +;; (at your option) any later version.
\r
193 +;; Notmuch is distributed in the hope that it will be useful, but
\r
194 +;; WITHOUT ANY WARRANTY; without even the implied warranty of
\r
195 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
196 +;; General Public License for more details.
\r
198 +;; You should have received a copy of the GNU General Public License
\r
199 +;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.
\r
201 +;; Authors: Carl Worth <cworth@cworth.org>
\r
203 +;; This is an emacs-based interface to the notmuch mail system.
\r
205 +;; You will first need to have the notmuch program installed and have a
\r
206 +;; notmuch database built in order to use this. See
\r
207 +;; http://notmuchmail.org for details.
\r
209 +;; To install this software, copy it to a directory that is on the
\r
210 +;; `load-path' variable within emacs (a good candidate is
\r
211 +;; /usr/local/share/emacs/site-lisp). If you are viewing this from the
\r
212 +;; notmuch source distribution then you can simply run:
\r
214 +;; sudo make install-emacs
\r
218 +;; Then, to actually run it, add:
\r
220 +;; (require 'notmuch)
\r
222 +;; to your ~/.emacs file, and then run "M-x notmuch" from within emacs,
\r
225 +;; emacs -f notmuch
\r
227 +;; Have fun, and let us know if you have any comment, questions, or
\r
228 +;; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not
\r
229 +;; required, but is available from http://notmuchmail.org).
\r
231 (eval-when-compile (require 'cl))
\r
233 @@ -139,10 +139,10 @@ This is basically just `format-kbd-macro' but we also convert ESC to M-."
\r
235 (concat desc " "))))
\r
237 -; I would think that emacs would have code handy for walking a keymap
\r
238 -; and generating strings for each key, and I would prefer to just call
\r
239 -; that. But I couldn't find any (could be all implemented in C I
\r
240 -; suppose), so I wrote my own here.
\r
241 +;; I would think that emacs would have code handy for walking a keymap
\r
242 +;; and generating strings for each key, and I would prefer to just call
\r
243 +;; that. But I couldn't find any (could be all implemented in C I
\r
244 +;; suppose), so I wrote my own here.
\r
245 (defun notmuch-substitute-one-command-key-with-prefix (prefix binding)
\r
246 "For a key binding, return a string showing a human-readable
\r
247 representation of the prefixed key as well as the first line of
\r
248 @@ -271,14 +271,14 @@ For a mouse binding, return nil."
\r
249 (defun notmuch-search-scroll-down ()
\r
250 "Move backward through the search results by one window's worth."
\r
252 - ; I don't know why scroll-down doesn't signal beginning-of-buffer
\r
253 - ; the way that scroll-up signals end-of-buffer, but c'est la vie.
\r
255 - ; So instead of trapping a signal we instead check whether the
\r
256 - ; window begins on the first line of the buffer and if so, move
\r
257 - ; directly to that position. (We have to count lines since the
\r
258 - ; window-start position is not the same as point-min due to the
\r
259 - ; invisible thread-ID characters on the first line.
\r
260 + ;; I don't know why scroll-down doesn't signal beginning-of-buffer
\r
261 + ;; the way that scroll-up signals end-of-buffer, but c'est la vie.
\r
263 + ;; So instead of trapping a signal we instead check whether the
\r
264 + ;; window begins on the first line of the buffer and if so, move
\r
265 + ;; directly to that position. (We have to count lines since the
\r
266 + ;; window-start position is not the same as point-min due to the
\r
267 + ;; invisible thread-ID characters on the first line.
\r
268 (if (equal (count-lines (point-min) (window-start)) 0)
\r
269 (goto-char (point-min))
\r
270 (scroll-down nil)))
\r