From cef5bb19dce668ccd99c9ce74b17c717e2c986b9 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sun, 10 Jun 2012 23:27:32 +0000 Subject: [PATCH] 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 * gnus-group.el (gnus-group-get-new-news): Respect `gnus-group-use-permanent-levels', as documented (bug#11638). 2012-06-10 Dave Abrahams * gnus-int.el (gnus-warp-to-article): Limit registry warping to real groups (bug#11641). --- lisp/gnus/ChangeLog | 10 ++++++++++ lisp/gnus/gnus-group.el | 2 +- lisp/gnus/gnus-int.el | 11 ++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index df3fa715751..aefb2a61683 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,13 @@ +2012-06-10 Lars Magne Ingebrigtsen + + * gnus-group.el (gnus-group-get-new-news): Respect + `gnus-group-use-permanent-levels', as documented (bug#11638). + +2012-06-10 Dave Abrahams + + * gnus-int.el (gnus-warp-to-article): Limit registry warping to real + groups (bug#11641). + 2012-06-07 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-msg-mail): Warn the user about Gnus not running diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index f97d9a69eae..ff41f13de30 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -4032,7 +4032,7 @@ re-scanning. If ARG is non-nil and not a number, this will force (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) diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el index 1190d79f778..52a8520a252 100644 --- a/lisp/gnus/gnus-int.el +++ b/lisp/gnus/gnus-int.el @@ -537,11 +537,12 @@ If BUFFER, insert the article in that group." "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." -- 2.11.4.GIT