--- /dev/null
+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 9A186431E64\r
+ for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 15:49:17 -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 7UegfP85Mqnt for <notmuch@notmuchmail.org>;\r
+ Mon, 30 Jan 2012 15:49:16 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+ [18.9.25.13])\r
+ by olra.theworths.org (Postfix) with ESMTP id AFDBF431FBC\r
+ for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 15:49:16 -0800 (PST)\r
+X-AuditID: 1209190d-b7fbf6d0000008ba-a5-4f272c7c32e6\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 8E.5B.02234.C7C272F4; Mon, 30 Jan 2012 18:49:16 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q0UNnFGp024661; \r
+ Mon, 30 Jan 2012 18:49:16 -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 q0UNnEe0007914\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Mon, 30 Jan 2012 18:49:15 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Rs0xT-0002VM-Et; Mon, 30 Jan 2012 18:48:23 -0500\r
+Date: Mon, 30 Jan 2012 18:48:23 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: David Edmondson <dme@dme.org>\r
+Subject: Re: [PATCH 2/2 v2] emacs: Prefer '[No Subject]' to blank subjects.\r
+Message-ID: <20120130234823.GV17991@mit.edu>\r
+References: <1327496913-4946-1-git-send-email-dme@dme.org>\r
+ <1327918561-16245-1-git-send-email-dme@dme.org>\r
+ <1327918561-16245-3-git-send-email-dme@dme.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1327918561-16245-3-git-send-email-dme@dme.org>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IRYrdT0a3RUfc3OHRI2GLfnS1MFtdvzmR2\r
+ YPLY9fwvk8ezVbeYA5iiuGxSUnMyy1KL9O0SuDJm/3jOUnBHvWL2xgPsDYyP5bsYOTkkBEwk\r
+ 1s77xQJhi0lcuLeerYuRi0NIYB+jxMdPW5khnA2MEs0nrrJDOCeZJJZNPcIO0iIksASo7HQB\r
+ iM0ioCrRd/U8WJxNQENi2/7ljCC2iICixP9vK8DizALSEt9+NzN1MXJwCAt4Sxw96QgS5hXQ\r
+ kbgyoRdq8zxGiastbxghEoISJ2c+YYHo1ZK48e8lWC/InOX/OEBMTgEbiXfLOUAqRAVUJKac\r
+ 3MY2gVFoFpLmWUiaZyE0L2BkXsUom5JbpZubmJlTnJqsW5ycmJeXWqRrpJebWaKXmlK6iREU\r
+ 1JySvDsY3x1UOsQowMGoxMMr8EnNX4g1say4MvcQoyQHk5Io7xF1dX8hvqT8lMqMxOKM+KLS\r
+ nNTiQ4wSHMxKIrxvVgOV86YkVlalFuXDpKQ5WJTEeVW13vkJCaQnlqRmp6YWpBbBZGU4OJQk\r
+ eJmB0SskWJSanlqRlplTgpBm4uAEGc4DNFwSpIa3uCAxtzgzHSJ/ilFRSpxXHiQhAJLIKM2D\r
+ 64UlnVeM4kCvCPN+0Aaq4gEmLLjuV0CDmYAGP2dQBRlckoiQkmpgdOfSVUqJWblx/RzBR68M\r
+ PkXJPDn170jp5Wb7Iw+7FYoKRIOlOyc+K3vde63sopJPbMXKNZp72g8xzLgclbRRe/Y6Y+26\r
+ hYsu8VvZrrhxkHNpb5qpqX3sVVmTgwfb7tuZpKrLBP9ZdsQ7t3B3po3Xloic21YTTs1SeTJv\r
+ w5Sr7d07ZUtbZpzKVWIpzkg01GIuKk4EACqkJsMVAwAA\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: Mon, 30 Jan 2012 23:49:17 -0000\r
+\r
+LGTM.\r
+\r
+Quoth David Edmondson on Jan 30 at 10:16 am:\r
+> ---\r
+> emacs/notmuch-lib.el | 9 +++++++++\r
+> emacs/notmuch-print.el | 8 ++++++--\r
+> emacs/notmuch-show.el | 5 ++++-\r
+> emacs/notmuch.el | 21 +++++++++------------\r
+> 4 files changed, 28 insertions(+), 15 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index c906ca7..d315f76 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -133,6 +133,15 @@ the user hasn't set this variable with the old or new value."\r
+> (interactive)\r
+> (kill-buffer (current-buffer)))\r
+> \r
+> +(defun notmuch-prettify-subject (subject)\r
+> + ;; This function is used by `notmuch-search-process-filter' which\r
+> + ;; requires that we not disrupt its' matching state.\r
+> + (save-match-data\r
+> + (if (and subject\r
+> + (string-match "^[ \t]*$" subject))\r
+> + "[No Subject]"\r
+> + subject)))\r
+> +\r
+> ;;\r
+> \r
+> (defun notmuch-common-do-stash (text)\r
+> diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el\r
+> index 880f96d..6653d97 100644\r
+> --- a/emacs/notmuch-print.el\r
+> +++ b/emacs/notmuch-print.el\r
+> @@ -19,6 +19,8 @@\r
+> ;;\r
+> ;; Authors: David Edmondson <dme@dme.org>\r
+> \r
+> +(require 'notmuch-lib)\r
+> +\r
+> (declare-function notmuch-show-get-prop "notmuch-show" (prop &optional props))\r
+> \r
+> (defcustom notmuch-print-mechanism 'notmuch-print-lpr\r
+> @@ -58,14 +60,16 @@ Optional OUTPUT allows passing a list of flags to muttprint."\r
+> \r
+> (defun notmuch-print-ps-print (msg)\r
+> "Print a message buffer using the ps-print package."\r
+> - (let ((subject (plist-get (notmuch-show-get-prop :headers msg) :Subject)))\r
+> + (let ((subject (notmuch-prettify-subject\r
+> + (plist-get (notmuch-show-get-prop :headers msg) :Subject))))\r
+> (rename-buffer subject t)\r
+> (ps-print-buffer)))\r
+> \r
+> (defun notmuch-print-ps-print/evince (msg)\r
+> "Preview a message buffer using ps-print and evince."\r
+> (let ((ps-file (make-temp-file "notmuch"))\r
+> - (subject (plist-get (notmuch-show-get-prop :headers msg) :Subject)))\r
+> + (subject (notmuch-prettify-subject\r
+> + (plist-get (notmuch-show-get-prop :headers msg) :Subject))))\r
+> (rename-buffer subject t)\r
+> (ps-print-buffer ps-file)\r
+> (notmuch-print-run-evince ps-file)))\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 84ac624..7ea9ba2 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -1017,7 +1017,7 @@ buffer."\r
+> (notmuch-show-next-open-message))\r
+> \r
+> ;; Set the header line to the subject of the first open message.\r
+> - (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-subject)))\r
+> + (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-pretty-subject)))\r
+> \r
+> (notmuch-show-mark-read)))\r
+> \r
+> @@ -1248,6 +1248,9 @@ Some useful entries are:\r
+> (defun notmuch-show-get-depth ()\r
+> (notmuch-show-get-prop :depth))\r
+> \r
+> +(defun notmuch-show-get-pretty-subject ()\r
+> + (notmuch-prettify-subject (notmuch-show-get-subject)))\r
+> +\r
+> (defun notmuch-show-set-tags (tags)\r
+> "Set the tags of the current message."\r
+> (notmuch-show-set-prop :tags tags)\r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index d4d6904..2b0a752 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -467,18 +467,14 @@ Complete list of currently available key bindings:\r
+> "Display the currently selected thread."\r
+> (interactive "P")\r
+> (let ((thread-id (notmuch-search-find-thread-id))\r
+> - (subject (notmuch-search-find-subject)))\r
+> + (subject (notmuch-prettify-subject (notmuch-search-find-subject))))\r
+> (if (> (length thread-id) 0)\r
+> - (progn\r
+> - (if (string-match "^[ \t]*$" subject)\r
+> - (setq subject "[No Subject]"))\r
+> -\r
+> - (notmuch-show thread-id\r
+> - (current-buffer)\r
+> - notmuch-search-query-string\r
+> - ;; Name the buffer based on the subject.\r
+> - (concat "*" (truncate-string-to-width subject 30 nil nil t) "*")\r
+> - crypto-switch))\r
+> + (notmuch-show thread-id\r
+> + (current-buffer)\r
+> + notmuch-search-query-string\r
+> + ;; Name the buffer based on the subject.\r
+> + (concat "*" (truncate-string-to-width subject 30 nil nil t) "*")\r
+> + crypto-switch)\r
+> (message "End of search results."))))\r
+> \r
+> (defun notmuch-search-reply-to-thread (&optional prompt-for-sender)\r
+> @@ -854,7 +850,8 @@ non-authors is found, assume that all of the authors match."\r
+> (if (/= (match-beginning 1) line)\r
+> (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line (match-beginning 1)) "\n")))\r
+> (let ((beg (point)))\r
+> - (notmuch-search-show-result date count authors subject tags)\r
+> + (notmuch-search-show-result date count authors\r
+> + (notmuch-prettify-subject subject) tags)\r
+> (notmuch-search-color-line beg (point) tag-list)\r
+> (put-text-property beg (point) 'notmuch-search-thread-id thread-id)\r
+> (put-text-property beg (point) 'notmuch-search-authors authors)\r
projects / notmuch-archives.git / commitdiff