[Emacs-diffs] /srv/bzr/emacs/trunk r106774: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106774
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2012-01-04 22:14:09 +0000
message:
  Merge changes made in Gnus trunk.
  
  2012-01-04  Lars Magne Ingebrigtsen  <address@hidden>
   * gnus.texi (Group Parameters): Note precedence.
  2012-01-04  Chris Gray  <address@hidden>  (tiny change)
   * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a
   live buffer.
  2012-01-04  Lars Magne Ingebrigtsen  <address@hidden>
   * nnir.el (nnir-retrieve-headers): Protect against the article not
   existing on the server (bug#10335).
  2012-01-04  Wolfgang Jenkner  <address@hidden>  (tiny change)
   * gnus-agent.el (gnus-agent-load-local): Recompute
   gnus-agent-article-local on changing method.
  2012-01-04  Lars Magne Ingebrigtsen  <address@hidden>
   * gnus.el (gnus-parameters): Note precedence.
  2012-01-04  Leo  <address@hidden>
   * nndraft.el (nndraft-update-unread-articles): Don't move point around
   in the group buffer.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-agent.el
  lisp/gnus/gnus.el
  lisp/gnus/mm-decode.el
  lisp/gnus/nndraft.el
  lisp/gnus/nnir.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-01-03 17:27:21 +0000
+++ b/doc/misc/ChangeLog        2012-01-04 22:14:09 +0000
@@ -1,3 +1,7 @@
+2012-01-04  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Group Parameters): Note precedence.
+
 2012-01-03  Eric Schulte  <address@hidden>
 
        * org.texi (Noweb reference syntax): Adding documentation of

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-12-31 01:27:15 +0000
+++ b/doc/misc/gnus.texi        2012-01-04 22:14:09 +0000
@@ -3187,8 +3187,10 @@
          (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

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-01-04 10:49:38 +0000
+++ b/lisp/gnus/ChangeLog       2012-01-04 22:14:09 +0000
@@ -1,3 +1,27 @@
+2012-01-04  Chris Gray  <address@hidden>  (tiny change)
+
+       * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a
+       live buffer.
+
+2012-01-04  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * nnir.el (nnir-retrieve-headers): Protect against the article not
+       existing on the server (bug#10335).
+
+2012-01-04  Wolfgang Jenkner  <address@hidden>  (tiny change)
+
+       * gnus-agent.el (gnus-agent-load-local): Recompute
+       gnus-agent-article-local on changing method.
+
+2012-01-04  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus.el (gnus-parameters): Note precedence.
+
+2012-01-04  Leo  <address@hidden>
+
+       * nndraft.el (nndraft-update-unread-articles): Don't move point around
+       in the group buffer.
+
 2012-01-04  Julien Danjou  <address@hidden>
 
        * nnimap.el (nnimap-update-info): Fix an error when all articles UIDs

=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el   2011-12-30 02:52:49 +0000
+++ b/lisp/gnus/gnus-agent.el   2012-01-04 22:14:09 +0000
@@ -2229,7 +2229,10 @@
 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")

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2011-12-04 08:02:42 +0000
+++ b/lisp/gnus/gnus.el 2012-01-04 22:14:09 +0000
@@ -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 <address@hidden>
@@ -1146,7 +1146,9 @@
                  (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

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2011-12-15 23:35:40 +0000
+++ b/lisp/gnus/mm-decode.el    2012-01-04 22:14:09 +0000
@@ -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 <address@hidden>
 ;;     MORIOKA Tomohiko <address@hidden>
@@ -1724,6 +1724,7 @@
                                      (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

=== modified file 'lisp/gnus/nndraft.el'
--- a/lisp/gnus/nndraft.el      2011-08-17 00:10:46 +0000
+++ b/lisp/gnus/nndraft.el      2012-01-04 22:14:09 +0000
@@ -181,13 +181,14 @@
           (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."

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-12-30 02:52:49 +0000
+++ b/lisp/gnus/nnir.el 2012-01-04 22:14:09 +0000
@@ -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 <address@hidden>
 ;; Swish-e and Swish++ backends by:
@@ -670,7 +670,8 @@
          (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)