Commit d6cd56f1 authored by Julien Danjou's avatar Julien Danjou Committed by Katsumi Yamaoka

mm-uu.el (mm-uu-dissect-text-parts): Only dissect handle that are inline.

gnus-art.el (article-hide-list-identifiers): Use gnus-group-get-list-identifiers.
* gnus-sum.el (gnus-group-get-list-identifiers): New function.
 (gnus-summary-remove-list-identifiers): Use gnus-group-get-list-identifiers to get regexp.
 (gnus-select-newsgroup, gnus-summary-insert-subject, gnus-summary-insert-articles): Call gnus-summary-remove-list-identifiers unconditionally.
parent 171fc304
2011-03-16 Julien Danjou <julien@danjou.info>
* mm-uu.el (mm-uu-dissect-text-parts): Only dissect handle that are
inline.
* gnus-art.el (article-hide-list-identifiers): Use
gnus-group-get-list-identifiers.
* gnus-sum.el (gnus-group-get-list-identifiers): New function.
(gnus-summary-remove-list-identifiers): Use
gnus-group-get-list-identifiers to get regexp.
(gnus-select-newsgroup, gnus-summary-insert-subject)
(gnus-summary-insert-articles): Call
gnus-summary-remove-list-identifiers unconditionally.
2011-03-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if
......
......@@ -3076,10 +3076,7 @@ images if any to the browser, and deletes them when exiting the group
The `gnus-list-identifiers' variable specifies what to do."
(interactive)
(let ((inhibit-point-motion-hooks t)
(regexp (or (gnus-parameter-list-identifier gnus-newsgroup-name)
(if (consp gnus-list-identifiers)
(mapconcat 'identity gnus-list-identifiers " *\\|")
gnus-list-identifiers)))
(regexp (gnus-group-get-list-identifiers gnus-newsgroup-name))
(inhibit-read-only t))
(when regexp
(save-excursion
......
......@@ -5510,12 +5510,17 @@ or a straight list of headers."
(cdr (assq number gnus-newsgroup-scored))
(memq number gnus-newsgroup-processable))))))
(defun gnus-group-get-list-identifiers (group)
"Get list identifier regexp for GROUP."
(or (gnus-parameter-list-identifier group)
(if (consp gnus-list-identifiers)
(mapconcat 'identity gnus-list-identifiers " *\\|")
gnus-list-identifiers)))
(defun gnus-summary-remove-list-identifiers ()
"Remove list identifiers in `gnus-list-identifiers' from articles in the current group."
(let ((regexp (if (consp gnus-list-identifiers)
(mapconcat 'identity gnus-list-identifiers " *\\|")
gnus-list-identifiers))
changed subject)
(let ((regexp (gnus-group-get-list-identifiers gnus-newsgroup-name))
changed subject)
(when regexp
(setq regexp (concat "^\\(?:R[Ee]: +\\)*\\(" regexp " *\\)"))
(dolist (header gnus-newsgroup-headers)
......@@ -5707,8 +5712,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(when gnus-agent
(gnus-agent-get-undownloaded-list))
;; Remove list identifiers from subject
(when gnus-list-identifiers
(gnus-summary-remove-list-identifiers))
(gnus-summary-remove-list-identifiers)
;; Check whether auto-expire is to be done in this group.
(setq gnus-newsgroup-auto-expire
(gnus-group-auto-expirable-p group))
......@@ -6576,9 +6580,8 @@ the subject line on."
(1+ (point-at-eol))
(gnus-delete-line))))))
;; Remove list identifiers from subject.
(when gnus-list-identifiers
(let ((gnus-newsgroup-headers (list header)))
(gnus-summary-remove-list-identifiers)))
(let ((gnus-newsgroup-headers (list header)))
(gnus-summary-remove-list-identifiers))
(when old-header
(mail-header-set-number header (mail-header-number old-header)))
(setq gnus-newsgroup-sparse
......@@ -12682,8 +12685,7 @@ returned."
(when gnus-agent
(gnus-agent-get-undownloaded-list))
;; Remove list identifiers from subject
(when gnus-list-identifiers
(gnus-summary-remove-list-identifiers))
(gnus-summary-remove-list-identifiers)
;; First and last article in this newsgroup.
(when gnus-newsgroup-headers
(setq gnus-newsgroup-begin
......
......@@ -705,6 +705,8 @@ Assume text has been decoded if DECODED is non-nil."
;; Mutt still uses application/pgp even though
;; it has already been withdrawn.
(string-match "\\`text/\\|\\`application/pgp\\'" type)
(equal (car (mm-handle-disposition handle))
"inline")
(setq
children
(with-current-buffer buffer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment