[PATCH 3/3] emacs: Prefer '[No Subject]' to blank subjects.

diff --git a/04/54b845a037e4dfdd55ed3298fc8ee347a70490 b/04/54b845a037e4dfdd55ed3298fc8ee347a70490
new file mode 100644 (file)
index 0000000..b2380b4
--- /dev/null
+++ b/04/54b845a037e4dfdd55ed3298fc8ee347a70490
@@ -0,0 +1,156 @@
+Return-Path: <dme@dme.org>\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 C023B431E84\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 05:48:41 -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 4J1xtZSQl3pU for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jan 2012 05:48:41 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ EBFCA431FBC   for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 05:48:40 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so4808711wgb.2\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 05:48:39 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.80.68 with SMTP id p4mr7402594wix.21.1327499319700;\r
+       Wed, 25 Jan 2012 05:48:39 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id m8sm1603917wia.11.2012.01.25.05.48.37\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jan 2012 05:48:38 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 205569FF26; Wed, 25 Jan 2012 13:48:36 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] emacs: Prefer '[No Subject]' to blank subjects.\r
+Date: Wed, 25 Jan 2012 13:48:34 +0000\r
+Message-Id: <1327499314-7887-4-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327499314-7887-1-git-send-email-dme@dme.org>\r
+References: <1327496913-4946-1-git-send-email-dme@dme.org>\r
+       <1327499314-7887-1-git-send-email-dme@dme.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmXJJoAuC69naV/UWVKiehNgFoW/D2mSP9FOIOcxf2Bsq0SbGRVtUN+wH+g6IMVi6QoZgLe\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: Wed, 25 Jan 2012 13:48:42 -0000\r
+\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
+-- \r
+1.7.8.3\r
+\r