[Emacs-diffs] /srv/bzr/emacs/trunk r108565: Merge bugfixes done in Gnus trunk

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 108565
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-06-11 22:35:02 +0000
message:
  Merge bugfixes done in Gnus trunk
  
  Those changes fix only the bugs having appeared in the bug list.
  Many other Gnus changes not yet merged to Emacs are in:
     ftp://ftp.jpl.org/pub/tmp/MaGnus-to-Emacs.patch
  (or http://www.jpl.org/ftp/pub/tmp/MaGnus-to-Emacs.patch)
  
  2012-06-11 Lars Magne Ingebrigtsen <address@hidden>
  * gnus.texi (Group Timestamp): Mention where to find documentation for
    the `gnus-tmp-' variables (bug#11601).
  2012-04-14 Wolfgang Jenkner <address@hidden>
  * gnus-agent.el (gnus-agent-retrieve-headers): Recalculate the range of
    articles when fetch-old is non-nil (bug#11370).
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-agent.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-06-11 13:03:39 +0000
+++ b/doc/misc/ChangeLog        2012-06-11 22:35:02 +0000
@@ -1,3 +1,8 @@
+2012-06-11  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Group Timestamp): Mention where to find documentation for
+       the `gnus-tmp-' variables (bug#11601).
+
 2012-06-11  Michael Albinus  <address@hidden>
 
        Sync with Tramp 2.2.6-pre.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2012-04-04 07:54:02 +0000
+++ b/doc/misc/gnus.texi        2012-06-11 22:35:02 +0000
@@ -4588,6 +4588,11 @@
       "")))
 @end lisp
 
+To see what variables are dynamically bound (like
address@hidden), you have to look at the source code.  The
+variable names aren't guaranteed to be stable over Gnus versions,
+either.
+
 
 @node File Commands
 @subsection File Commands

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-06-10 23:27:32 +0000
+++ b/lisp/gnus/ChangeLog       2012-06-11 22:35:02 +0000
@@ -1,3 +1,8 @@
+2012-04-14  Wolfgang Jenkner  <address@hidden>
+
+       * gnus-agent.el (gnus-agent-retrieve-headers): Recalculate the range of
+       articles when fetch-old is non-nil (bug#11370).
+
 2012-06-10  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-group.el (gnus-group-get-new-news): Respect

=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el   2012-02-28 08:17:21 +0000
+++ b/lisp/gnus/gnus-agent.el   2012-06-11 22:35:02 +0000
@@ -3742,6 +3742,13 @@
       (gnus-make-directory (nnheader-translate-file-chars
                            (file-name-directory file) t))
 
+      (when fetch-old
+       (setq articles (gnus-uncompress-range
+                       (cons (if (numberp fetch-old)
+                                 (max 1 (- (car articles) fetch-old))
+                               1)
+                             (car (last articles))))))
+
       ;; Populate temp buffer with known headers
       (when (file-exists-p file)
        (with-current-buffer gnus-agent-overview-buffer
@@ -3778,12 +3785,7 @@
                    (set-buffer nntp-server-buffer)
                    (let* ((fetched-articles (list nil))
                           (tail-fetched-articles fetched-articles)
-                          (min (cond ((numberp fetch-old)
-                                      (max 1 (- (car articles) fetch-old)))
-                                     (fetch-old
-                                      1)
-                                     (t
-                                      (car articles))))
+                          (min (car articles))
                           (max (car (last articles))))
 
                      ;; Get the list of articles that were fetched
@@ -3858,8 +3860,7 @@
             (not (numberp fetch-old)))
        t                               ; Don't remove anything.
       (nnheader-nov-delete-outside-range
-       (if fetch-old (max 1 (- (car articles) fetch-old))
-        (car articles))
+       (car articles)
        (car (last articles)))
       t)