auto upstream

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1f1b46c8532..745e0ede5a8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-summary-read-group-1): Protect against not being
+        able to find the article, which can happen in debbugs groups,
+        apparently.
+
 2013-01-16  Glenn Morris  <rgm@gnu.org>
 
         * smiley.el (smiley-style): Make the file loadable in batch mode.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index ea68a6a2fa5..658863f9f00 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -4058,9 +4058,10 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                  gnus-auto-select-first)
             (progn
               (let ((art (gnus-summary-article-number)))
-                (unless (and (not gnus-plugged)
-                             (or (memq art gnus-newsgroup-undownloaded)
-                                 (memq art gnus-newsgroup-downloadable)))
+                (when (and art
+                           gnus-plugged
+                           (not (memq art gnus-newsgroup-undownloaded))
+                           (not (memq art gnus-newsgroup-downloadable)))
                   (gnus-summary-goto-article art))))
           ;; Don't select any articles.
           (gnus-summary-position-point)