debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: do not modify subject in search or show

Browse source 
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"
This commit is contained in:
Jameson Graef Rollins 2012-04-14 19:17:52 -07:00 committed by David Bremner
parent 0ff54ab712
commit cbba1d1ba9
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
emacs/notmuch-show.el
View file

@ -1075,7 +1075,7 @@ function is used."
(run-hooks 'notmuch-show-hook)) (run-hooks 'notmuch-show-hook))
;; Set the header line to the subject of the first message. ;; 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 () (defun notmuch-show-capture-state ()
"Capture the state of the current buffer. "Capture the state of the current buffer.
@ -1375,9 +1375,6 @@ current thread."
(defun notmuch-show-get-depth () (defun notmuch-show-get-depth ()
(notmuch-show-get-prop :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) (defun notmuch-show-set-tags (tags)
"Set the tags of the current message." "Set the tags of the current message."
(notmuch-show-set-prop :tags tags) (notmuch-show-set-prop :tags tags)

5
emacs/notmuch.el
View file

@ -507,7 +507,7 @@ Complete list of currently available key bindings:
"Display the currently selected thread." "Display the currently selected thread."
(interactive) (interactive)
(let ((thread-id (notmuch-search-find-thread-id)) (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) (if (> (length thread-id) 0)
(notmuch-show thread-id (notmuch-show thread-id
(current-buffer) (current-buffer)
@ -877,8 +877,7 @@ non-authors is found, assume that all of the authors match."
;; We currently just throw away excluded matches. ;; We currently just throw away excluded matches.
(unless (eq (aref count 1) ?0) (unless (eq (aref count 1) ?0)
(let ((beg (point))) (let ((beg (point)))
(notmuch-search-show-result date count authors (notmuch-search-show-result date count authors subject tags)
(notmuch-prettify-subject subject) tags)
(notmuch-search-color-line beg (point) tag-list) (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-thread-id thread-id)
(put-text-property beg (point) 'notmuch-search-authors authors) (put-text-property beg (point) 'notmuch-search-authors authors)