From f0e07604fa03e54f68c15ebe827d37136c7a8c0b Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Mon, 30 Jan 2012 10:16:01 +0000 Subject: [PATCH] [PATCH 2/2 v2] emacs: Prefer '[No Subject]' to blank subjects. --- 16/7b40681a938f0996e722c1fedda6a7d9e1faa5 | 180 ++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 16/7b40681a938f0996e722c1fedda6a7d9e1faa5 diff --git a/16/7b40681a938f0996e722c1fedda6a7d9e1faa5 b/16/7b40681a938f0996e722c1fedda6a7d9e1faa5 new file mode 100644 index 000000000..b24b6b1a0 --- /dev/null +++ b/16/7b40681a938f0996e722c1fedda6a7d9e1faa5 @@ -0,0 +1,180 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id F30BD431FBC + for ; Mon, 30 Jan 2012 02:16:08 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 48w11HhteSxn for ; + Mon, 30 Jan 2012 02:16:08 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D532D431E64 + for ; Mon, 30 Jan 2012 02:16:07 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so3434902wib.26 + for ; Mon, 30 Jan 2012 02:16:06 -0800 (PST) +Received: by 10.180.97.199 with SMTP id ec7mr26219180wib.8.1327918566553; + Mon, 30 Jan 2012 02:16:06 -0800 (PST) +Received: from hotblack-desiato.hh.sledj.net + (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) + by mx.google.com with ESMTPS id q7sm29092186wix.5.2012.01.30.02.16.04 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 30 Jan 2012 02:16:05 -0800 (PST) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 16953A0CEE; Mon, 30 Jan 2012 10:16:03 +0000 (GMT) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2 v2] emacs: Prefer '[No Subject]' to blank subjects. +Date: Mon, 30 Jan 2012 10:16:01 +0000 +Message-Id: <1327918561-16245-3-git-send-email-dme@dme.org> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1327918561-16245-1-git-send-email-dme@dme.org> +References: <1327496913-4946-1-git-send-email-dme@dme.org> + <1327918561-16245-1-git-send-email-dme@dme.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 30 Jan 2012 10:16:09 -0000 + +--- + emacs/notmuch-lib.el | 9 +++++++++ + emacs/notmuch-print.el | 8 ++++++-- + emacs/notmuch-show.el | 5 ++++- + emacs/notmuch.el | 21 +++++++++------------ + 4 files changed, 28 insertions(+), 15 deletions(-) + +diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +index c906ca7..d315f76 100644 +--- a/emacs/notmuch-lib.el ++++ b/emacs/notmuch-lib.el +@@ -133,6 +133,15 @@ the user hasn't set this variable with the old or new value." + (interactive) + (kill-buffer (current-buffer))) + ++(defun notmuch-prettify-subject (subject) ++ ;; This function is used by `notmuch-search-process-filter' which ++ ;; requires that we not disrupt its' matching state. ++ (save-match-data ++ (if (and subject ++ (string-match "^[ \t]*$" subject)) ++ "[No Subject]" ++ subject))) ++ + ;; + + (defun notmuch-common-do-stash (text) +diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el +index 880f96d..6653d97 100644 +--- a/emacs/notmuch-print.el ++++ b/emacs/notmuch-print.el +@@ -19,6 +19,8 @@ + ;; + ;; Authors: David Edmondson + ++(require 'notmuch-lib) ++ + (declare-function notmuch-show-get-prop "notmuch-show" (prop &optional props)) + + (defcustom notmuch-print-mechanism 'notmuch-print-lpr +@@ -58,14 +60,16 @@ Optional OUTPUT allows passing a list of flags to muttprint." + + (defun notmuch-print-ps-print (msg) + "Print a message buffer using the ps-print package." +- (let ((subject (plist-get (notmuch-show-get-prop :headers msg) :Subject))) ++ (let ((subject (notmuch-prettify-subject ++ (plist-get (notmuch-show-get-prop :headers msg) :Subject)))) + (rename-buffer subject t) + (ps-print-buffer))) + + (defun notmuch-print-ps-print/evince (msg) + "Preview a message buffer using ps-print and evince." + (let ((ps-file (make-temp-file "notmuch")) +- (subject (plist-get (notmuch-show-get-prop :headers msg) :Subject))) ++ (subject (notmuch-prettify-subject ++ (plist-get (notmuch-show-get-prop :headers msg) :Subject)))) + (rename-buffer subject t) + (ps-print-buffer ps-file) + (notmuch-print-run-evince ps-file))) +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 84ac624..7ea9ba2 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1017,7 +1017,7 @@ buffer." + (notmuch-show-next-open-message)) + + ;; Set the header line to the subject of the first open message. +- (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-subject))) ++ (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-pretty-subject))) + + (notmuch-show-mark-read))) + +@@ -1248,6 +1248,9 @@ Some useful entries are: + (defun notmuch-show-get-depth () + (notmuch-show-get-prop :depth)) + ++(defun notmuch-show-get-pretty-subject () ++ (notmuch-prettify-subject (notmuch-show-get-subject))) ++ + (defun notmuch-show-set-tags (tags) + "Set the tags of the current message." + (notmuch-show-set-prop :tags tags) +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index d4d6904..2b0a752 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -467,18 +467,14 @@ Complete list of currently available key bindings: + "Display the currently selected thread." + (interactive "P") + (let ((thread-id (notmuch-search-find-thread-id)) +- (subject (notmuch-search-find-subject))) ++ (subject (notmuch-prettify-subject (notmuch-search-find-subject)))) + (if (> (length thread-id) 0) +- (progn +- (if (string-match "^[ \t]*$" subject) +- (setq subject "[No Subject]")) +- +- (notmuch-show thread-id +- (current-buffer) +- notmuch-search-query-string +- ;; Name the buffer based on the subject. +- (concat "*" (truncate-string-to-width subject 30 nil nil t) "*") +- crypto-switch)) ++ (notmuch-show thread-id ++ (current-buffer) ++ notmuch-search-query-string ++ ;; Name the buffer based on the subject. ++ (concat "*" (truncate-string-to-width subject 30 nil nil t) "*") ++ crypto-switch) + (message "End of search results.")))) + + (defun notmuch-search-reply-to-thread (&optional prompt-for-sender) +@@ -854,7 +850,8 @@ non-authors is found, assume that all of the authors match." + (if (/= (match-beginning 1) line) + (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line (match-beginning 1)) "\n"))) + (let ((beg (point))) +- (notmuch-search-show-result date count authors subject tags) ++ (notmuch-search-show-result date count authors ++ (notmuch-prettify-subject subject) tags) + (notmuch-search-color-line beg (point) tag-list) + (put-text-property beg (point) 'notmuch-search-thread-id thread-id) + (put-text-property beg (point) 'notmuch-search-authors authors) +-- +1.7.8.3 + -- 2.26.2