From cef5bb19dce668ccd99c9ce74b17c717e2c986b9 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sun, 10 Jun 2012 23:27:32 +0000 Subject: 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/gnus-int.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lisp/gnus/gnus-int.el') 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." -- cgit v1.2.3