1 Return-Path: <too@nixu.com>
\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 6AFFB429E21
\r
6 for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 07:13:47 -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 anz1R9eh5K+S for <notmuch@notmuchmail.org>;
\r
16 Wed, 11 Jan 2012 07:13:46 -0800 (PST)
\r
17 Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id D9775431FB6
\r
21 for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 07:13:45 -0800 (PST)
\r
22 Received: from pps.filterd (mail-gw3 [127.0.0.1])
\r
23 by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id q0BFAl0n029043;
\r
24 Wed, 11 Jan 2012 17:13:37 +0200
\r
25 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
\r
26 by mail-gw3.nixu.fi with ESMTP id 114cs0yvhj-1
\r
27 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
28 Wed, 11 Jan 2012 17:13:37 +0200
\r
29 Received: from taco2.nixu.fi (localhost [127.0.0.1])
\r
30 by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id
\r
32 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
\r
33 Wed, 11 Jan 2012 17:13:36 +0200
\r
34 Received: (from too@localhost)
\r
35 by taco2.nixu.fi (8.14.3/8.14.3/Submit) id q0BFDasP031961;
\r
36 Wed, 11 Jan 2012 17:13:36 +0200
\r
37 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH] emacs: whitespace-cleanup for emacs/*.el files
\r
40 Date: Wed, 11 Jan 2012 17:13:35 +0200
\r
41 Message-Id: <1326294815-31926-1-git-send-email-tomi.ollila@iki.fi>
\r
42 X-Mailer: git-send-email 1.7.7.3
\r
43 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110,
\r
44 1.0.211, 0.0.0000 definitions=2012-01-11_03:2012-01-11, 2012-01-11,
\r
45 1970-01-01 signatures=0
\r
46 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0
\r
47 ipscore=0 suspectscore=1
\r
48 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0
\r
50 scancount=1 engine=6.0.2-1012030000 definitions=main-1201110119
\r
51 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
52 X-BeenThere: notmuch@notmuchmail.org
\r
53 X-Mailman-Version: 2.1.13
\r
55 List-Id: "Use and development of the notmuch mail system."
\r
56 <notmuch.notmuchmail.org>
\r
57 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
59 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
60 List-Post: <mailto:notmuch@notmuchmail.org>
\r
61 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
62 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
64 X-List-Received-Date: Wed, 11 Jan 2012 15:13:47 -0000
\r
68 do emacs -q --batch --eval \
\r
69 "(progn (find-file \"$f\") (whitespace-cleanup) (save-buffer))"
\r
73 removed trailing whitespace and empty lines at the end of file
\r
74 removed spaces before tab (if any)
\r
75 converted 8 spaces to tabs in the beginning of line
\r
77 emacs/coolj.el | 16 ++++++------
\r
78 emacs/notmuch-lib.el | 3 +-
\r
79 emacs/notmuch-maildir-fcc.el | 7 ++---
\r
80 emacs/notmuch-show.el | 52 +++++++++++++++++++++---------------------
\r
81 emacs/notmuch.el | 42 +++++++++++++++++-----------------
\r
82 5 files changed, 59 insertions(+), 61 deletions(-)
\r
84 diff --git a/emacs/coolj.el b/emacs/coolj.el
\r
85 index 60af60a..173eb2f 100644
\r
86 --- a/emacs/coolj.el
\r
87 +++ b/emacs/coolj.el
\r
88 @@ -108,11 +108,11 @@ If the line should not be broken, return nil; point remains on the
\r
90 (move-to-column fill-column)
\r
91 (if (and (re-search-forward "[^ ]" (line-end-position) 1)
\r
92 - (> (current-column) fill-column))
\r
93 + (> (current-column) fill-column))
\r
94 ;; This line is too long. Can we break it?
\r
95 (or (coolj-find-break-backward prefix)
\r
96 - (progn (move-to-column fill-column)
\r
97 - (coolj-find-break-forward)))))
\r
98 + (progn (move-to-column fill-column)
\r
99 + (coolj-find-break-forward)))))
\r
101 (defun coolj-find-break-backward (prefix)
\r
102 "Move point backward to the first available breakpoint and return t.
\r
103 @@ -135,11 +135,11 @@ If no breakpoint is found, return nil."
\r
104 If no break point is found, return nil."
\r
105 (and (search-forward " " (line-end-position) 1)
\r
106 (progn (skip-chars-forward " " (line-end-position))
\r
109 (if (and fill-nobreak-predicate
\r
110 - (run-hook-with-args-until-success
\r
111 - 'fill-nobreak-predicate))
\r
112 - (coolj-find-break-forward)
\r
114 + (run-hook-with-args-until-success
\r
115 + 'fill-nobreak-predicate))
\r
116 + (coolj-find-break-forward)
\r
120 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
121 index 0f856bf..4a4505c 100644
\r
122 --- a/emacs/notmuch-lib.el
\r
123 +++ b/emacs/notmuch-lib.el
\r
124 @@ -110,7 +110,7 @@ the user hasn't set this variable with the old or new value."
\r
127 (when (funcall predicate (car list))
\r
128 - (push (car list) out))
\r
129 + (push (car list) out))
\r
130 (setq list (cdr list)))
\r
133 @@ -156,4 +156,3 @@ was called."
\r
134 (make-variable-buffer-local 'notmuch-show-process-crypto)
\r
136 (provide 'notmuch-lib)
\r
138 diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
\r
139 index 6fbf82d..06a6486 100644
\r
140 --- a/emacs/notmuch-maildir-fcc.el
\r
141 +++ b/emacs/notmuch-maildir-fcc.el
\r
142 @@ -65,7 +65,7 @@ yet when sending a mail."
\r
143 ;; Set up the message-fcc-handler to move mails to the maildir in Fcc
\r
144 ;; The parameter is set to mark messages as "seen"
\r
145 (setq message-fcc-handler-function
\r
146 - (lambda (destdir)
\r
147 + (lambda (destdir)
\r
148 (notmuch-maildir-fcc-write-buffer-to-maildir destdir t)))
\r
149 ;; add a hook to actually insert the Fcc header when sending
\r
150 (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup))
\r
151 @@ -116,7 +116,7 @@ will NOT be removed or replaced."
\r
152 (if (= (elt subdir 0) ?/)
\r
154 (concat (notmuch-database-path) "/" subdir)))))
\r
157 ;; finally test if fcc points to a valid maildir
\r
158 (let ((fcc-header (message-field-value "Fcc")))
\r
159 (unless (notmuch-maildir-fcc-dir-is-maildir-p fcc-header)
\r
160 @@ -128,7 +128,7 @@ will NOT be removed or replaced."
\r
161 (notmuch-maildir-fcc-create-maildir fcc-header))
\r
163 (error "Message not sent"))))))))
\r
166 (defun notmuch-maildir-fcc-host-fixer (hostname)
\r
167 (replace-regexp-in-string "/\\|:"
\r
169 @@ -216,4 +216,3 @@ return t if successful, and nil otherwise."
\r
171 (notmuch-fcc-initialization)
\r
172 (provide 'notmuch-maildir-fcc)
\r
174 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
175 index 5502efd..1ff871f 100644
\r
176 --- a/emacs/notmuch-show.el
\r
177 +++ b/emacs/notmuch-show.el
\r
178 @@ -115,9 +115,9 @@ indentation."
\r
180 (let ((id (notmuch-show-get-message-id)))
\r
181 (let ((buf (generate-new-buffer (concat "*notmuch-msg-" id "*"))))
\r
182 - (with-current-buffer buf
\r
183 + (with-current-buffer buf
\r
184 (call-process notmuch-command nil t nil "show" "--format=raw" id)
\r
187 (kill-buffer buf)))))
\r
189 (defun notmuch-show-view-all-mime-parts ()
\r
190 @@ -143,23 +143,23 @@ indentation."
\r
192 (defun notmuch-foreach-mime-part (function mm-handle)
\r
193 (cond ((stringp (car mm-handle))
\r
194 - (dolist (part (cdr mm-handle))
\r
195 - (notmuch-foreach-mime-part function part)))
\r
196 - ((bufferp (car mm-handle))
\r
197 - (funcall function mm-handle))
\r
198 - (t (dolist (part mm-handle)
\r
199 - (notmuch-foreach-mime-part function part)))))
\r
200 + (dolist (part (cdr mm-handle))
\r
201 + (notmuch-foreach-mime-part function part)))
\r
202 + ((bufferp (car mm-handle))
\r
203 + (funcall function mm-handle))
\r
204 + (t (dolist (part mm-handle)
\r
205 + (notmuch-foreach-mime-part function part)))))
\r
207 (defun notmuch-count-attachments (mm-handle)
\r
209 (notmuch-foreach-mime-part
\r
211 (let ((disposition (mm-handle-disposition p)))
\r
212 - (and (listp disposition)
\r
213 - (or (equal (car disposition) "attachment")
\r
214 - (and (equal (car disposition) "inline")
\r
215 - (assq 'filename disposition)))
\r
217 + (and (listp disposition)
\r
218 + (or (equal (car disposition) "attachment")
\r
219 + (and (equal (car disposition) "inline")
\r
220 + (assq 'filename disposition)))
\r
225 @@ -168,13 +168,13 @@ indentation."
\r
227 (let ((disposition (mm-handle-disposition p)))
\r
228 (and (listp disposition)
\r
229 - (or (equal (car disposition) "attachment")
\r
230 - (and (equal (car disposition) "inline")
\r
231 - (assq 'filename disposition)))
\r
234 - (concat "Save '" (cdr (assq 'filename disposition)) "' ")))
\r
235 - (mm-save-part p))))
\r
236 + (or (equal (car disposition) "attachment")
\r
237 + (and (equal (car disposition) "inline")
\r
238 + (assq 'filename disposition)))
\r
241 + (concat "Save '" (cdr (assq 'filename disposition)) "' ")))
\r
242 + (mm-save-part p))))
\r
245 (defun notmuch-show-save-attachments ()
\r
246 @@ -236,15 +236,15 @@ unchanged ADDRESS if parsing fails."
\r
247 ;; Remove double quotes. They might be required during transport,
\r
248 ;; but we don't need to see them.
\r
250 - (setq name (replace-regexp-in-string "\"" "" name)))
\r
251 + (setq name (replace-regexp-in-string "\"" "" name)))
\r
252 ;; If the address is 'foo@bar.com <foo@bar.com>' then show just
\r
254 (when (string= name address)
\r
260 - (concat name " <" address ">")))
\r
262 + (concat name " <" address ">")))
\r
265 (defun notmuch-show-insert-headerline (headers date tags depth)
\r
266 @@ -755,7 +755,7 @@ current buffer, if possible."
\r
267 (put-text-property message-start message-end :notmuch-message-extent (cons message-start message-end))
\r
269 (let ((headers-overlay (make-overlay headers-start headers-end))
\r
270 - (invis-specs (list headers-invis-spec message-invis-spec)))
\r
271 + (invis-specs (list headers-invis-spec message-invis-spec)))
\r
272 (overlay-put headers-overlay 'invisible invis-specs)
\r
273 (overlay-put headers-overlay 'priority 10))
\r
274 (overlay-put (make-overlay body-start body-end) 'invisible message-invis-spec)
\r
275 @@ -1307,7 +1307,7 @@ than only the current message."
\r
276 (interactive "P\nsPipe message to command: ")
\r
277 (let (shell-command)
\r
279 - (setq shell-command
\r
280 + (setq shell-command
\r
281 (concat notmuch-command " show --format=mbox "
\r
282 (shell-quote-argument
\r
283 (mapconcat 'identity (notmuch-show-get-message-ids-for-open-messages) " OR "))
\r
284 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
285 index 1e61775..aab26c5 100644
\r
286 --- a/emacs/notmuch.el
\r
287 +++ b/emacs/notmuch.el
\r
288 @@ -84,23 +84,23 @@ For example:
\r
290 (defun notmuch-foreach-mime-part (function mm-handle)
\r
291 (cond ((stringp (car mm-handle))
\r
292 - (dolist (part (cdr mm-handle))
\r
293 - (notmuch-foreach-mime-part function part)))
\r
294 - ((bufferp (car mm-handle))
\r
295 - (funcall function mm-handle))
\r
296 - (t (dolist (part mm-handle)
\r
297 - (notmuch-foreach-mime-part function part)))))
\r
298 + (dolist (part (cdr mm-handle))
\r
299 + (notmuch-foreach-mime-part function part)))
\r
300 + ((bufferp (car mm-handle))
\r
301 + (funcall function mm-handle))
\r
302 + (t (dolist (part mm-handle)
\r
303 + (notmuch-foreach-mime-part function part)))))
\r
305 (defun notmuch-count-attachments (mm-handle)
\r
307 (notmuch-foreach-mime-part
\r
309 (let ((disposition (mm-handle-disposition p)))
\r
310 - (and (listp disposition)
\r
311 - (or (equal (car disposition) "attachment")
\r
312 - (and (equal (car disposition) "inline")
\r
313 - (assq 'filename disposition)))
\r
315 + (and (listp disposition)
\r
316 + (or (equal (car disposition) "attachment")
\r
317 + (and (equal (car disposition) "inline")
\r
318 + (assq 'filename disposition)))
\r
323 @@ -109,13 +109,13 @@ For example:
\r
325 (let ((disposition (mm-handle-disposition p)))
\r
326 (and (listp disposition)
\r
327 - (or (equal (car disposition) "attachment")
\r
328 - (and (equal (car disposition) "inline")
\r
329 - (assq 'filename disposition)))
\r
332 - (concat "Save '" (cdr (assq 'filename disposition)) "' ")))
\r
333 - (mm-save-part p))))
\r
334 + (or (equal (car disposition) "attachment")
\r
335 + (and (equal (car disposition) "inline")
\r
336 + (assq 'filename disposition)))
\r
339 + (concat "Save '" (cdr (assq 'filename disposition)) "' ")))
\r
340 + (mm-save-part p))))
\r
343 (defun notmuch-documentation-first-line (symbol)
\r
344 @@ -655,7 +655,7 @@ Here is an example of how to color search results based on tags.
\r
346 (setq notmuch-search-line-faces '((\"delete\" . (:foreground \"red\"
\r
347 :background \"blue\"))
\r
348 - (\"unread\" . (:foreground \"green\"))))
\r
349 + (\"unread\" . (:foreground \"green\"))))
\r
351 The attributes defined for matching tags are merged, with later
\r
352 attributes overriding earlier. A message having both \"delete\"
\r
353 @@ -920,9 +920,9 @@ The optional parameters are used as follows:
\r
355 oldest-first: A Boolean controlling the sort order of returned threads
\r
356 target-thread: A thread ID (with the thread: prefix) that will be made
\r
357 - current if it appears in the search results.
\r
358 + current if it appears in the search results.
\r
359 target-line: The line number to move to if the target thread does not
\r
360 - appear in the search results."
\r
361 + appear in the search results."
\r
362 (interactive (list (notmuch-read-query "Notmuch search: ")))
\r
363 (let ((buffer (get-buffer-create (notmuch-search-buffer-title query))))
\r
364 (switch-to-buffer buffer)
\r