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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 108551
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-10 23:27:32 +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-10 Lars Magne Ingebrigtsen <address@hidden>
  * gnus-group.el (gnus-group-get-new-news): Respect
    `gnus-group-use-permanent-levels', as documented (bug#11638).
  2012-06-10 Dave Abrahams <address@hidden>
  * gnus-int.el (gnus-warp-to-article): Limit registry warping to real
    groups (bug#11641).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/gnus/gnus-int.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-06-08 04:38:56 +0000
+++ b/lisp/gnus/ChangeLog       2012-06-10 23:27:32 +0000
@@ -1,3 +1,13 @@
+2012-06-10  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-group.el (gnus-group-get-new-news): Respect
+       `gnus-group-use-permanent-levels', as documented (bug#11638).
+
+2012-06-10  Dave Abrahams  <address@hidden>
+
+       * gnus-int.el (gnus-warp-to-article): Limit registry warping to real
+       groups (bug#11641).
+
 2012-06-07  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-msg.el (gnus-msg-mail): Warn the user about Gnus not running

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2012-02-02 11:07:55 +0000
+++ b/lisp/gnus/gnus-group.el   2012-06-10 23:27:32 +0000
@@ -4032,7 +4032,7 @@
     (unless gnus-slave
       (gnus-master-read-slave-newsrc))
 
-    (gnus-get-unread-articles arg)
+    (gnus-get-unread-articles (gnus-group-default-level arg t))
 
     ;; If the user wants it, we scan for new groups.
     (when (eq gnus-check-new-newsgroups 'always)

=== modified file 'lisp/gnus/gnus-int.el'
--- a/lisp/gnus/gnus-int.el     2012-03-12 11:48:55 +0000
+++ b/lisp/gnus/gnus-int.el     2012-06-10 23:27:32 +0000
@@ -537,11 +537,12 @@
   "Warps from an article in a virtual group to the article in its
 real group. Does nothing on a real group."
   (interactive)
-  (let ((gnus-command-method
-        (gnus-find-method-for-group gnus-newsgroup-name)))
-    (when (gnus-check-backend-function
-          'warp-to-article (car gnus-command-method))
-      (funcall (gnus-get-function gnus-command-method 'warp-to-article)))))
+  (when (gnus-virtual-group-p gnus-newsgroup-name)
+    (let ((gnus-command-method
+          (gnus-find-method-for-group gnus-newsgroup-name)))
+      (when (gnus-check-backend-function
+            'warp-to-article (car gnus-command-method))
+       (funcall (gnus-get-function gnus-command-method 'warp-to-article))))))
 
 (defun gnus-request-head (article group)
   "Request the head of ARTICLE in GROUP."