From c4efd5fbb0012b0dacf7dc0a6ca526242920602a Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 15 Apr 2012 20:23:43 +0300 Subject: [PATCH] [No Subject] --- 29/173ad3e2532b57198f667497caf73b672f8a64 | 129 ++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 29/173ad3e2532b57198f667497caf73b672f8a64 diff --git a/29/173ad3e2532b57198f667497caf73b672f8a64 b/29/173ad3e2532b57198f667497caf73b672f8a64 new file mode 100644 index 000000000..dfc533e84 --- /dev/null +++ b/29/173ad3e2532b57198f667497caf73b672f8a64 @@ -0,0 +1,129 @@ +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 EF2E7431FAF + for ; Sun, 15 Apr 2012 10:23:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 M0IU-S3yUlz4 for ; + Sun, 15 Apr 2012 10:23:47 -0700 (PDT) +Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) + by olra.theworths.org (Postfix) with ESMTP id 9D626431FAE + for ; Sun, 15 Apr 2012 10:23:47 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id A785768055; Sun, 15 Apr 2012 20:23:43 +0300 (EEST) +From: Tomi Ollila +To: Jameson Graef Rollins , + Notmuch Mail +Subject: [No Subject] +In-Reply-To: <1334456272-10376-1-git-send-email-jrollins@finestructure.net> +References: <1334448507-16877-1-git-send-email-jrollins@finestructure.net> + <1334456272-10376-1-git-send-email-jrollins@finestructure.net> +User-Agent: Notmuch/0.12+113~gde05574 (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +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 17:23:49 -0000 + +On Sun, Apr 15 2012, Jameson Graef Rollins wrote: + +> 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" +> --- + +I agree. LGTM. + +Tomi + +> Sorry, there was a small bug in the previous version (notmuch-print.el +> was mistakenly modified). +> +> emacs/notmuch-show.el | 5 +---- +> emacs/notmuch.el | 5 ++--- +> 2 files changed, 3 insertions(+), 7 deletions(-) +> +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2