Mercurial > emacs
changeset 111096:d7e691f6ffc0
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.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sat, 23 Oct 2010 00:01:49 +0000 |
| parents | 29ab0a67fbd8 |
| children | 811daa44285f |
| files | doc/misc/ChangeLog doc/misc/gnus.texi lisp/gnus/ChangeLog lisp/gnus/gnus-group.el lisp/gnus/shr.el |
| diffstat | 5 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Fri Oct 22 01:02:31 2010 -0700 +++ b/doc/misc/ChangeLog Sat Oct 23 00:01:49 2010 +0000 @@ -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
--- a/doc/misc/gnus.texi Fri Oct 22 01:02:31 2010 -0700 +++ b/doc/misc/gnus.texi Sat Oct 23 00:01:49 2010 +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
--- a/lisp/gnus/ChangeLog Fri Oct 22 01:02:31 2010 -0700 +++ b/lisp/gnus/ChangeLog Sat Oct 23 00:01:49 2010 +0000 @@ -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.
--- a/lisp/gnus/gnus-group.el Fri Oct 22 01:02:31 2010 -0700 +++ b/lisp/gnus/gnus-group.el Sat Oct 23 00:01:49 2010 +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)
--- a/lisp/gnus/shr.el Fri Oct 22 01:02:31 2010 -0700 +++ b/lisp/gnus/shr.el Sat Oct 23 00:01:49 2010 +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"))