mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

gnus-sum.el: Merge changes made in Gnus master

Browse source 
2012-07-09 Tassilo Horn <tassilo@member.fsf.org>
* gnus-sum.el (gnus-summary-limit-to-author): Use default value instead
  of initial input when reading the author to restrict the summary to.
2012-04-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-select-newsgroup): Don't assume that the group
  buffer exists, which it doesn't if we haven't started Gnus.
This commit is contained in:
Gnus developers 2012-07-09 22:12:19 +00:00 • committed by Katsumi Yamaoka
parent cda158b40d
commit 59aadc36c3
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lisp/gnus/gnus-sum.el
View file

@ -5679,7 +5679,9 @@ If SELECT-ARTICLES, only select those articles from GROUP."
;; Init the dependencies hash table.
(setq gnus-newsgroup-dependencies
(gnus-make-hashtable (length articles)))
(gnus-set-global-variables)
(if (gnus-buffer-live-p gnus-group-buffer)
(gnus-set-global-variables)
(set-default 'gnus-newsgroup-name gnus-newsgroup-name))
;; Retrieve the headers and read them in.
(setq gnus-newsgroup-headers (gnus-fetch-headers articles))
@ -5961,7 +5963,6 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(setq mark (car marks)
mark-type (gnus-article-mark-to-type mark)
var (intern (format "gnus-newsgroup-%s" (car (rassq mark types)))))
;; We set the variable according to the type of the marks list,
;; and then adjust the marks to a subset of the active articles.
(cond
@ -8230,14 +8231,17 @@ If NOT-MATCHING, excluding articles that have subjects that match a regexp."
"Limit the summary buffer to articles that have authors that match a regexp.
If NOT-MATCHING, excluding articles that have authors that match a regexp."
(interactive
(list (read-string (if current-prefix-arg
"Exclude author (regexp): "
"Limit to author (regexp): ")
(let ((header (gnus-summary-article-header)))
(if (not header)
""
(car (mail-header-parse-address
(mail-header-from header))))))
(list (let* ((header (gnus-summary-article-header))
(default (and header (car (mail-header-parse-address
(mail-header-from header))))))
(read-string (concat (if current-prefix-arg
"Exclude author (regexp"
"Limit to author (regexp")
(if default
(concat ", default \"" default "\"): ")
"): "))
nil nil
default))
current-prefix-arg))
(gnus-summary-limit-to-subject from "from" not-matching))