1 Return-Path: <amdragon@mit.edu>
\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 9A186431E64
\r
6 for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 15:49:17 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\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 7UegfP85Mqnt for <notmuch@notmuchmail.org>;
\r
16 Mon, 30 Jan 2012 15:49:16 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id AFDBF431FBC
\r
20 for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 15:49:16 -0800 (PST)
\r
21 X-AuditID: 1209190d-b7fbf6d0000008ba-a5-4f272c7c32e6
\r
22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
\r
23 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 8E.5B.02234.C7C272F4; Mon, 30 Jan 2012 18:49:16 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q0UNnFGp024661;
\r
27 Mon, 30 Jan 2012 18:49:16 -0500
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0UNnEe0007914
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Mon, 30 Jan 2012 18:49:15 -0500 (EST)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1Rs0xT-0002VM-Et; Mon, 30 Jan 2012 18:48:23 -0500
\r
37 Date: Mon, 30 Jan 2012 18:48:23 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: David Edmondson <dme@dme.org>
\r
40 Subject: Re: [PATCH 2/2 v2] emacs: Prefer '[No Subject]' to blank subjects.
\r
41 Message-ID: <20120130234823.GV17991@mit.edu>
\r
42 References: <1327496913-4946-1-git-send-email-dme@dme.org>
\r
43 <1327918561-16245-1-git-send-email-dme@dme.org>
\r
44 <1327918561-16245-3-git-send-email-dme@dme.org>
\r
46 Content-Type: text/plain; charset=us-ascii
\r
47 Content-Disposition: inline
\r
48 In-Reply-To: <1327918561-16245-3-git-send-email-dme@dme.org>
\r
49 User-Agent: Mutt/1.5.21 (2010-09-15)
\r
50 X-Brightmail-Tracker:
\r
51 H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IRYrdT0a3RUfc3OHRI2GLfnS1MFtdvzmR2
\r
52 YPLY9fwvk8ezVbeYA5iiuGxSUnMyy1KL9O0SuDJm/3jOUnBHvWL2xgPsDYyP5bsYOTkkBEwk
\r
53 1s77xQJhi0lcuLeerYuRi0NIYB+jxMdPW5khnA2MEs0nrrJDOCeZJJZNPcIO0iIksASo7HQB
\r
54 iM0ioCrRd/U8WJxNQENi2/7ljCC2iICixP9vK8DizALSEt9+NzN1MXJwCAt4Sxw96QgS5hXQ
\r
55 kbgyoRdq8zxGiastbxghEoISJ2c+YYHo1ZK48e8lWC/InOX/OEBMTgEbiXfLOUAqRAVUJKac
\r
56 3MY2gVFoFpLmWUiaZyE0L2BkXsUom5JbpZubmJlTnJqsW5ycmJeXWqRrpJebWaKXmlK6iREU
\r
57 1JySvDsY3x1UOsQowMGoxMMr8EnNX4g1say4MvcQoyQHk5Io7xF1dX8hvqT8lMqMxOKM+KLS
\r
58 nNTiQ4wSHMxKIrxvVgOV86YkVlalFuXDpKQ5WJTEeVW13vkJCaQnlqRmp6YWpBbBZGU4OJQk
\r
59 eJmB0SskWJSanlqRlplTgpBm4uAEGc4DNFwSpIa3uCAxtzgzHSJ/ilFRSpxXHiQhAJLIKM2D
\r
60 64UlnVeM4kCvCPN+0Aaq4gEmLLjuV0CDmYAGP2dQBRlckoiQkmpgdOfSVUqJWblx/RzBR68M
\r
61 PkXJPDn170jp5Wb7Iw+7FYoKRIOlOyc+K3vde63sopJPbMXKNZp72g8xzLgclbRRe/Y6Y+26
\r
62 hYsu8VvZrrhxkHNpb5qpqX3sVVmTgwfb7tuZpKrLBP9ZdsQ7t3B3po3Xloic21YTTs1SeTJv
\r
63 w5Sr7d07ZUtbZpzKVWIpzkg01GIuKk4EACqkJsMVAwAA
\r
64 Cc: notmuch@notmuchmail.org
\r
65 X-BeenThere: notmuch@notmuchmail.org
\r
66 X-Mailman-Version: 2.1.13
\r
68 List-Id: "Use and development of the notmuch mail system."
\r
69 <notmuch.notmuchmail.org>
\r
70 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
71 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
72 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
73 List-Post: <mailto:notmuch@notmuchmail.org>
\r
74 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
75 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
76 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
77 X-List-Received-Date: Mon, 30 Jan 2012 23:49:17 -0000
\r
81 Quoth David Edmondson on Jan 30 at 10:16 am:
\r
83 > emacs/notmuch-lib.el | 9 +++++++++
\r
84 > emacs/notmuch-print.el | 8 ++++++--
\r
85 > emacs/notmuch-show.el | 5 ++++-
\r
86 > emacs/notmuch.el | 21 +++++++++------------
\r
87 > 4 files changed, 28 insertions(+), 15 deletions(-)
\r
89 > diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
90 > index c906ca7..d315f76 100644
\r
91 > --- a/emacs/notmuch-lib.el
\r
92 > +++ b/emacs/notmuch-lib.el
\r
93 > @@ -133,6 +133,15 @@ the user hasn't set this variable with the old or new value."
\r
95 > (kill-buffer (current-buffer)))
\r
97 > +(defun notmuch-prettify-subject (subject)
\r
98 > + ;; This function is used by `notmuch-search-process-filter' which
\r
99 > + ;; requires that we not disrupt its' matching state.
\r
100 > + (save-match-data
\r
101 > + (if (and subject
\r
102 > + (string-match "^[ \t]*$" subject))
\r
108 > (defun notmuch-common-do-stash (text)
\r
109 > diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el
\r
110 > index 880f96d..6653d97 100644
\r
111 > --- a/emacs/notmuch-print.el
\r
112 > +++ b/emacs/notmuch-print.el
\r
113 > @@ -19,6 +19,8 @@
\r
115 > ;; Authors: David Edmondson <dme@dme.org>
\r
117 > +(require 'notmuch-lib)
\r
119 > (declare-function notmuch-show-get-prop "notmuch-show" (prop &optional props))
\r
121 > (defcustom notmuch-print-mechanism 'notmuch-print-lpr
\r
122 > @@ -58,14 +60,16 @@ Optional OUTPUT allows passing a list of flags to muttprint."
\r
124 > (defun notmuch-print-ps-print (msg)
\r
125 > "Print a message buffer using the ps-print package."
\r
126 > - (let ((subject (plist-get (notmuch-show-get-prop :headers msg) :Subject)))
\r
127 > + (let ((subject (notmuch-prettify-subject
\r
128 > + (plist-get (notmuch-show-get-prop :headers msg) :Subject))))
\r
129 > (rename-buffer subject t)
\r
130 > (ps-print-buffer)))
\r
132 > (defun notmuch-print-ps-print/evince (msg)
\r
133 > "Preview a message buffer using ps-print and evince."
\r
134 > (let ((ps-file (make-temp-file "notmuch"))
\r
135 > - (subject (plist-get (notmuch-show-get-prop :headers msg) :Subject)))
\r
136 > + (subject (notmuch-prettify-subject
\r
137 > + (plist-get (notmuch-show-get-prop :headers msg) :Subject))))
\r
138 > (rename-buffer subject t)
\r
139 > (ps-print-buffer ps-file)
\r
140 > (notmuch-print-run-evince ps-file)))
\r
141 > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
142 > index 84ac624..7ea9ba2 100644
\r
143 > --- a/emacs/notmuch-show.el
\r
144 > +++ b/emacs/notmuch-show.el
\r
145 > @@ -1017,7 +1017,7 @@ buffer."
\r
146 > (notmuch-show-next-open-message))
\r
148 > ;; Set the header line to the subject of the first open message.
\r
149 > - (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-subject)))
\r
150 > + (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-pretty-subject)))
\r
152 > (notmuch-show-mark-read)))
\r
154 > @@ -1248,6 +1248,9 @@ Some useful entries are:
\r
155 > (defun notmuch-show-get-depth ()
\r
156 > (notmuch-show-get-prop :depth))
\r
158 > +(defun notmuch-show-get-pretty-subject ()
\r
159 > + (notmuch-prettify-subject (notmuch-show-get-subject)))
\r
161 > (defun notmuch-show-set-tags (tags)
\r
162 > "Set the tags of the current message."
\r
163 > (notmuch-show-set-prop :tags tags)
\r
164 > diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
165 > index d4d6904..2b0a752 100644
\r
166 > --- a/emacs/notmuch.el
\r
167 > +++ b/emacs/notmuch.el
\r
168 > @@ -467,18 +467,14 @@ Complete list of currently available key bindings:
\r
169 > "Display the currently selected thread."
\r
170 > (interactive "P")
\r
171 > (let ((thread-id (notmuch-search-find-thread-id))
\r
172 > - (subject (notmuch-search-find-subject)))
\r
173 > + (subject (notmuch-prettify-subject (notmuch-search-find-subject))))
\r
174 > (if (> (length thread-id) 0)
\r
176 > - (if (string-match "^[ \t]*$" subject)
\r
177 > - (setq subject "[No Subject]"))
\r
179 > - (notmuch-show thread-id
\r
180 > - (current-buffer)
\r
181 > - notmuch-search-query-string
\r
182 > - ;; Name the buffer based on the subject.
\r
183 > - (concat "*" (truncate-string-to-width subject 30 nil nil t) "*")
\r
184 > - crypto-switch))
\r
185 > + (notmuch-show thread-id
\r
186 > + (current-buffer)
\r
187 > + notmuch-search-query-string
\r
188 > + ;; Name the buffer based on the subject.
\r
189 > + (concat "*" (truncate-string-to-width subject 30 nil nil t) "*")
\r
191 > (message "End of search results."))))
\r
193 > (defun notmuch-search-reply-to-thread (&optional prompt-for-sender)
\r
194 > @@ -854,7 +850,8 @@ non-authors is found, assume that all of the authors match."
\r
195 > (if (/= (match-beginning 1) line)
\r
196 > (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line (match-beginning 1)) "\n")))
\r
197 > (let ((beg (point)))
\r
198 > - (notmuch-search-show-result date count authors subject tags)
\r
199 > + (notmuch-search-show-result date count authors
\r
200 > + (notmuch-prettify-subject subject) tags)
\r
201 > (notmuch-search-color-line beg (point) tag-list)
\r
202 > (put-text-property beg (point) 'notmuch-search-thread-id thread-id)
\r
203 > (put-text-property beg (point) 'notmuch-search-authors authors)
\r