From 280f417b7e9404fdc6b242e0b2edb0d3923055e6 Mon Sep 17 00:00:00 2001
From: Gnus developers <ding@gnus.org>
Date: Sat, 23 Oct 2010 00:01:49 +0000
Subject: [PATCH] Merge changes made in Gnus trunk.

gnus.texi (Subscription Commands): Mention that you can also subscribe to new groups via the Server buffer, which is probably more convenient when subscribing to many groups.
gnus-group.el (gnus-group-mark-group): Use gnus-group-position-point instead of the summary one.
shr.el (shr-tag-img): Don't bug out on images that don't have a SRC.
---
 doc/misc/ChangeLog      | 6 ++++++
 doc/misc/gnus.texi      | 6 ++++++
 lisp/gnus/ChangeLog     | 7 +++++++
 lisp/gnus/gnus-group.el | 4 ++--
 lisp/gnus/shr.el        | 3 ++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a87fb9e610e..9c768950702 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-22  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* gnus.texi (Subscription Commands): Mention that you can also
+	subscribe to new groups via the Server buffer, which is probably more
+	convenient when subscribing to many groups.
+
 2010-10-21  Julien Danjou  <julien@danjou.info>
 
 	* message.texi (Message Headers): Allow message-default-headers to be a
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 7b642aefda0..a45ad232e65 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -2211,6 +2211,12 @@ selected.
 @section Subscription Commands
 @cindex subscription
 
+The following commands allow for managing your subscriptions in the
+Group buffer.  If you want to subscribe to many groups, it's probably
+more convenient to go to the @ref{Server Buffer}, and choose the
+server there using @kbd{RET} or @kbd{SPC}.  Then you'll have the
+commands listed in @ref{Browse Foreign Server} at hand.
+
 @table @kbd
 
 @item S t
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7c3b91cbea7..699e1b6da5a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el (shr-tag-img): Don't bug out on images that don't have a SRC.
+
+	* gnus-group.el (gnus-group-mark-group): Use gnus-group-position-point
+	instead of the summary one.
+
 2010-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mml.el (mml-preview): Work properly when editing article.
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 7152c18d145..7720c1cc7e6 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1887,7 +1887,7 @@ If FIRST-TOO, the current line is also eligible as a target."
       (unless no-advance
 	(gnus-group-next-group 1))
       (decf n))
-    (gnus-summary-position-point)
+    (gnus-group-position-point)
     n))
 
 (defun gnus-group-unmark-group (n)
@@ -4009,7 +4009,7 @@ If DONT-SCAN is non-nil, scan non-activated groups as well."
       (goto-char beg))
     (when gnus-goto-next-group-when-activating
       (gnus-group-next-unread-group 1 t))
-    (gnus-summary-position-point)
+    (gnus-group-position-point)
     ret))
 
 (defun gnus-group-fetch-control (group)
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index a25fc2c262a..6646cecb2fa 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -487,7 +487,8 @@ Return a string with image data."
   (browse-url-url-encode-chars url "[)$ ]"))
 
 (defun shr-tag-img (cont)
-  (when cont
+  (when (and cont
+	     (cdr (assq :src cont)))
     (when (and (> (current-column) 0)
 	       (not (eq shr-state 'image)))
       (insert "\n"))
-- 
2.11.4.GIT