[Emacs-diffs] /srv/bzr/emacs/trunk r102049: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102049
author: Gnus developers
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 00:01:49 +0000
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/gnus/shr.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-21 22:12:01 +0000
+++ b/doc/misc/ChangeLog        2010-10-23 00:01:49 +0000
@@ -1,3 +1,9 @@
+2010-10-22  Tassilo Horn  <address@hidden>
+
+       * 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  <address@hidden>
 
        * message.texi (Message Headers): Allow message-default-headers to be a

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2010-10-21 00:33:40 +0000
+++ b/doc/misc/gnus.texi        2010-10-23 00:01:49 +0000
@@ -2211,6 +2211,12 @@
 @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

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-22 04:15:14 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-23 00:01:49 +0000
@@ -1,3 +1,10 @@
+2010-10-22  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mml.el (mml-preview): Work properly when editing article.

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2010-10-22 01:39:13 +0000
+++ b/lisp/gnus/gnus-group.el   2010-10-23 00:01:49 +0000
@@ -1887,7 +1887,7 @@
       (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 @@
       (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)

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-21 05:36:36 +0000
+++ b/lisp/gnus/shr.el  2010-10-23 00:01:49 +0000
@@ -487,7 +487,8 @@
   (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"))