procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes made in Gnus trunk.

Browse source 
2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * gnus.texi (Group Parameters): Note precedence.
2012-01-04  Chris Gray  <chrismgray@gmail.com>  (tiny change)
 * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a
 live buffer.
2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * nnir.el (nnir-retrieve-headers): Protect against the article not
 existing on the server (bug#10335).
2012-01-04  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
 * gnus-agent.el (gnus-agent-load-local): Recompute
 gnus-agent-article-local on changing method.
2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * gnus.el (gnus-parameters): Note precedence.
2012-01-04  Leo  <sdl.web@gmail.com>
 * nndraft.el (nndraft-update-unread-articles): Don't move point around
 in the group buffer.
This commit is contained in:
Gnus developers 2012-01-04 22:14:09 +00:00 • committed by Katsumi Yamaoka
parent a7183d7c46
commit 9937bef4b8
8 changed files with 53 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/misc/ChangeLog
View file

@ -1,3 +1,7 @@
2012-01-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Group Parameters): Note precedence.
2012-01-03 Eric Schulte <eric.schulte@gmx.com>
* org.texi (Noweb reference syntax): Adding documentation of

6
doc/misc/gnus.texi
View file

@ -3187,8 +3187,10 @@ For example:
(broken-reply-to . t))))
@end lisp
String value of parameters will be subjected to regexp substitution, as
the @code{to-group} example shows.
The first clause that matches the group name will be used.
Parameters that are strings will be subjected to regexp substitution,
as the @code{to-group} example shows.
@vindex gnus-parameters-case-fold-search
By default, whether comparing the group name and one of those regexps

24
lisp/gnus/ChangeLog
View file

@ -1,3 +1,27 @@
2012-01-04 Chris Gray <chrismgray@gmail.com> (tiny change)
* mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a
live buffer.
2012-01-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
* nnir.el (nnir-retrieve-headers): Protect against the article not
existing on the server (bug#10335).
2012-01-04 Wolfgang Jenkner <wjenkner@inode.at> (tiny change)
* gnus-agent.el (gnus-agent-load-local): Recompute
gnus-agent-article-local on changing method.
2012-01-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.el (gnus-parameters): Note precedence.
2012-01-04 Leo <sdl.web@gmail.com>
* nndraft.el (nndraft-update-unread-articles): Don't move point around
in the group buffer.
2012-01-04 Julien Danjou <julien@danjou.info>
* nnimap.el (nnimap-update-info): Fix an error when all articles UIDs

5
lisp/gnus/gnus-agent.el
View file

@ -2229,7 +2229,10 @@ doesn't exist, to valid the overview buffer."
article counts for each of the method's subscribed groups."
(let ((gnus-command-method (or method gnus-command-method)))
(when (or (null gnus-agent-article-local-times)
(zerop gnus-agent-article-local-times))
(zerop gnus-agent-article-local-times)
(not (gnus-methods-equal-p
gnus-command-method
(symbol-value (intern "+method" gnus-agent-article-local)))))
(setq gnus-agent-article-local
(gnus-cache-file-contents
(gnus-agent-lib-file "local")

6
lisp/gnus/gnus.el
View file

@ -1,6 +1,6 @@
;;; gnus.el --- a newsreader for GNU Emacs
;; Copyright (C) 1987-1990, 1993-1998, 2000-2011
;; Copyright (C) 1987-1990, 1993-1998, 2000-2012
;; Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@ -1146,7 +1146,9 @@ For example:
(display . all))
(\"mail\\\\.me\" (gnus-use-scoring t))
(\"list\\\\..*\" (total-expire . t)
(broken-reply-to . t)))"
(broken-reply-to . t)))
The first clause that matches the group name will be used."
:version "22.1"
:group 'gnus-group-various
:type '(repeat (cons regexp

3
lisp/gnus/mm-decode.el
View file

@ -1,6 +1,6 @@
;;; mm-decode.el --- Functions for decoding MIME things
;; Copyright (C) 1998-2011 Free Software Foundation, Inc.
;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
@ -1724,6 +1724,7 @@ If RECURSIVE, search recursively."
(buffer-string))))))
shr-inhibit-images shr-blocked-images charset char)
(if (and (boundp 'gnus-summary-buffer)
(bufferp gnus-summary-buffer)
(buffer-name gnus-summary-buffer))
(with-current-buffer gnus-summary-buffer
(setq shr-inhibit-images gnus-inhibit-images

15
lisp/gnus/nndraft.el
View file

@ -181,13 +181,14 @@ are generated if and only if they are also in `message-draft-headers'.")
(gnus-get-new-news-hook nil)
(inhibit-read-only t))
(gnus-group-get-new-news-this-group nil t)
(dolist (group groups)
(unless (and gnus-permanently-visible-groups
(string-match gnus-permanently-visible-groups
group))
(gnus-group-goto-group group)
(when (zerop (gnus-group-group-unread))
(gnus-delete-line)))))))
(save-excursion
(dolist (group groups)
(unless (and gnus-permanently-visible-groups
(string-match gnus-permanently-visible-groups
group))
(gnus-group-goto-group group)
(when (zerop (gnus-group-group-unread))
(gnus-delete-line))))))))
(deffoo nndraft-request-associate-buffer (group)
"Associate the current buffer with some article in the draft group."

5
lisp/gnus/nnir.el
View file

@ -1,6 +1,6 @@
;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*-
;; Copyright (C) 1998-2011 Free Software Foundation, Inc.
;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de>
;; Swish-e and Swish++ backends by:
@ -670,7 +670,8 @@ Add an entry here when adding a new search engine.")
(goto-char (point-min))
(while (not (eobp))
(let* ((novitem (funcall parsefunc))
(artno (mail-header-number novitem))
(artno (and novitem
(mail-header-number novitem)))
(art (car (rassq artno articleids))))
(when art
(mail-header-set-number novitem art)