diff options
| author | Gnus developers <ding@gnus.org> | 2010-10-23 00:01:49 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-23 00:01:49 +0000 |
| commit | 280f417b7e9404fdc6b242e0b2edb0d3923055e6 (patch) | |
| tree | d31f64f73d0097a0f49288e20773382ff09a6992 /lisp/gnus | |
| parent | 039c6cc33e93a240921b43cf70fbbd43b8ba7018 (diff) | |
| download | emacs-280f417b7e9404fdc6b242e0b2edb0d3923055e6.tar.gz emacs-280f417b7e9404fdc6b242e0b2edb0d3923055e6.tar.bz2 emacs-280f417b7e9404fdc6b242e0b2edb0d3923055e6.zip | |
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.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 3 |
3 files changed, 11 insertions, 3 deletions
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")) |