--- /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 454DA431FB6\r
+ for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 21:22:46 -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 FA+IpXQlePGr for <notmuch@notmuchmail.org>;\r
+ Fri, 27 Jan 2012 21:22:45 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id 858C6431FAE\r
+ for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 21:22:45 -0800 (PST)\r
+X-AuditID: 1209190f-b7f8a6d000000914-d9-4f23862416c7\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 94.F5.02324.426832F4; Sat, 28 Jan 2012 00:22:44 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q0S5Mijv030362; \r
+ Sat, 28 Jan 2012 00:22:44 -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 q0S5MhYB009718\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 28 Jan 2012 00:22:44 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Rr0jg-00050q-W1; Sat, 28 Jan 2012 00:22:01 -0500\r
+Date: Sat, 28 Jan 2012 00:22:00 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: David Edmondson <dme@dme.org>\r
+Subject: Re: [PATCH 3/3] emacs: Prefer '[No Subject]' to blank subjects.\r
+Message-ID: <20120128052200.GB17991@mit.edu>\r
+References: <1327496913-4946-1-git-send-email-dme@dme.org>\r
+ <1327499314-7887-1-git-send-email-dme@dme.org>\r
+ <1327499314-7887-4-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: <1327499314-7887-4-git-send-email-dme@dme.org>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hTV1lVpU/Y3WLDc0GLfnS1MFtdvzmR2\r
+ YPLY9fwvk8ezVbeYA5iiuGxSUnMyy1KL9O0SuDL+v5vHXNAsWzFzDmcD4wbxLkZODgkBE4kz\r
+ J74zQthiEhfurWfrYuTiEBLYxyixeNMnJghnA6PEsSXbmCGck0wSb+5PZIFwljBKdN06yATS\r
+ zyKgKnH5VRfYLDYBDYlt+5eD2SICihL/v61gB7GZBaQlvv1uBqsXFvCQaL63FMzmFdCRWL/5\r
+ EtSGOYwSq3qfsEMkBCVOznzCAtGsJXHj30ugBg6wQcv/cYCYnALWEmu/soFUiAqoSEw5uY1t\r
+ AqPQLCTNs5A0z0JoXsDIvIpRNiW3Sjc3MTOnODVZtzg5MS8vtUjXRC83s0QvNaV0EyM4rCX5\r
+ dzB+O6h0iFGAg1GJh/fCKyV/IdbEsuLK3EOMkhxMSqK8sq3K/kJ8SfkplRmJxRnxRaU5qcWH\r
+ GCU4mJVEeO94KfoL8aYkVlalFuXDpKQ5WJTEedW03vkJCaQnlqRmp6YWpBbBZGU4OJQkeJeA\r
+ DBUsSk1PrUjLzClBSDNxcIIM5wEangNSw1tckJhbnJkOkT/FqCglztsLkhAASWSU5sH1wtLO\r
+ K0ZxoFeEeTeBVPEAUxZc9yugwUxAgyOuglxdXJKIkJJqYJx65p5g6qJF2Z9mhdZ6bYj7z6Ep\r
+ k2n5WudXFo/1TJv7ZRHS1n8jW25Mz87MYxORT6+3vu7029vT9Mzd/fnLeQ6/u3WchaGW8Zb4\r
+ VFG+C6bry1KstAomv/1hVrJRYofU6og9+yVr5rlPeqvsF5O9x0msUJhF2m5HsLVimaTmpFXf\r
+ vv9nOlHBo8RSnJFoqMVcVJwIANLUFp8WAwAA\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: Sat, 28 Jan 2012 05:22:46 -0000\r
+\r
+LGTM other than what Mark pointed out about this not applying to\r
+subjects in the search buffer.\r
+\r
+Quoth David Edmondson on Jan 25 at 1:48 pm:\r
+> ---\r
+> emacs/notmuch-lib.el | 6 ++++++\r
+> emacs/notmuch-print.el | 8 ++++++--\r
+> emacs/notmuch-show.el | 5 ++++-\r
+> emacs/notmuch.el | 5 +----\r
+> 4 files changed, 17 insertions(+), 7 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 241fe8c..5b8a41c 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -130,6 +130,12 @@ 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
+> + (if (and subject\r
+> + (string-match "^[ \t]*$" subject))\r
+> + (setq subject "[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 83eb525..51bb740 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
+> (defcustom notmuch-print-mechanism 'notmuch-print-lpr\r
+> "How should printing be done?"\r
+> :group 'notmuch\r
+> @@ -56,14 +58,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 e6a5b31..c602b3e 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -985,7 +985,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
+> @@ -1216,6 +1216,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 3f6b977..ce1e232 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -440,10 +440,7 @@ 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
+> -\r
+> - (if (string-match "^[ \t]*$" subject)\r
+> - (setq subject "[No Subject]"))\r
+> + (subject (notmuch-prettify-subject (notmuch-search-find-subject))))\r
+> \r
+> (if (> (length thread-id) 0)\r
+> (notmuch-show thread-id\r
projects / notmuch-archives.git / commitdiff