From 1ff829e85a935a5d725c8620a50073c4258883e9 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 15 Apr 2012 17:08:27 +1700 Subject: [PATCH] [PATCH] emacs: do not modify subject in search or show --- 7c/1409bf80b81b57360ea3c5094d8426e804a905 | 137 ++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 7c/1409bf80b81b57360ea3c5094d8426e804a905 diff --git a/7c/1409bf80b81b57360ea3c5094d8426e804a905 b/7c/1409bf80b81b57360ea3c5094d8426e804a905 new file mode 100644 index 000000000..bb77d77a5 --- /dev/null +++ b/7c/1409bf80b81b57360ea3c5094d8426e804a905 @@ -0,0 +1,137 @@ +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 78BBE431FDB + for ; Sat, 14 Apr 2012 17:08:43 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 UPa3gD7V7mrv for ; + Sat, 14 Apr 2012 17:08:32 -0700 (PDT) +Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu + [131.215.239.19]) + by olra.theworths.org (Postfix) with ESMTP id 176DA431FAE + for ; Sat, 14 Apr 2012 17:08:32 -0700 (PDT) +Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by fire-doxen-postvirus (Postfix) with ESMTP id B3078328032 + for ; Sat, 14 Apr 2012 17:08:29 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new +Received: from finestructure.net (unknown [76.89.193.65]) + (Authenticated sender: jrollins) + by fire-doxen-submit (Postfix) with ESMTP id BC8C132802A + for ; Sat, 14 Apr 2012 17:08:27 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 4E81F45D; Sat, 14 Apr 2012 17:08:27 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH] emacs: do not modify subject in search or show +Date: Sat, 14 Apr 2012 17:08:27 -0700 +Message-Id: <1334448507-16877-1-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.9.5 +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: Sun, 15 Apr 2012 00:08:43 -0000 + +A previous patch [0] replaced blank subject lines with '[No Subject]' +in search and show mode. Apparently this was needed to circumvent +some bug in the printing code, but there was no need for it search or +show, and it is definitely not desirable, so we undo it here (a revert +is no longer feasible). We should not be modifying strings in the +original message without good reason, or without a clear indication +that we are doing so, neither of which apply in this case. For +further discussion see [0]. + +[0] id:"1327918561-16245-3-git-send-email-dme@dme.org" +--- + emacs/notmuch-print.el | 4 ++-- + emacs/notmuch-show.el | 5 +---- + emacs/notmuch.el | 5 ++--- + 3 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el +index 6653d97..81b2ef0 100644 +--- a/emacs/notmuch-print.el ++++ b/emacs/notmuch-print.el +@@ -60,7 +60,7 @@ 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 (notmuch-prettify-subject ++ (let ((subject (notmuch-print-prettify-subject + (plist-get (notmuch-show-get-prop :headers msg) :Subject)))) + (rename-buffer subject t) + (ps-print-buffer))) +@@ -68,7 +68,7 @@ Optional OUTPUT allows passing a list of flags to muttprint." + (defun notmuch-print-ps-print/evince (msg) + "Preview a message buffer using ps-print and evince." + (let ((ps-file (make-temp-file "notmuch")) +- (subject (notmuch-prettify-subject ++ (subject (notmuch-print-prettify-subject + (plist-get (notmuch-show-get-prop :headers msg) :Subject)))) + (rename-buffer subject t) + (ps-print-buffer ps-file) +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 30b26d1..1e55099 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1075,7 +1075,7 @@ function is used." + (run-hooks 'notmuch-show-hook)) + + ;; Set the header line to the subject of the first message. +- (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-pretty-subject))))) ++ (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-subject))))) + + (defun notmuch-show-capture-state () + "Capture the state of the current buffer. +@@ -1375,9 +1375,6 @@ current thread." + (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 ba833e6..326645d 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -507,7 +507,7 @@ Complete list of currently available key bindings: + "Display the currently selected thread." + (interactive) + (let ((thread-id (notmuch-search-find-thread-id)) +- (subject (notmuch-prettify-subject (notmuch-search-find-subject)))) ++ (subject (notmuch-search-find-subject))) + (if (> (length thread-id) 0) + (notmuch-show thread-id + (current-buffer) +@@ -877,8 +877,7 @@ non-authors is found, assume that all of the authors match." + ;; We currently just throw away excluded matches. + (unless (eq (aref count 1) ?0) + (let ((beg (point))) +- (notmuch-search-show-result date count authors +- (notmuch-prettify-subject subject) tags) ++ (notmuch-search-show-result date count authors 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.9.5 + -- 2.26.2