diff options
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/gnus.texi | 6 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 24 | ||||
| -rw-r--r-- | lisp/gnus/gnus-agent.el | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/nndraft.el | 15 | ||||
| -rw-r--r-- | lisp/gnus/nnir.el | 5 |
8 files changed, 53 insertions, 15 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 30c4b01d3f..21aef5c5a9 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -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 diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 76bfbc4bb5..6523dc9528 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -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 diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 34f914a8b0..7b3cb1d53e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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 diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index d268dd7b0c..56ba6a9fac 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -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") diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index b1f0f60668..459f4cc881 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -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 diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 7ea0902bdb..ec8dd5bf8c 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -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 diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el index 0b47062a91..976e6e657e 100644 --- a/lisp/gnus/nndraft.el +++ b/lisp/gnus/nndraft.el @@ -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." diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index ceeaeda930..1d4f1c25a0 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -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) |