Mercurial > emacs
changeset 110040:63fee04d3f81
Make html image insertion probably work for XEmacs, too by Lars Magne Ingebrigtsen <larsi@gnus.org>.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 30 Aug 2010 23:29:56 +0000 |
| parents | 459fd421257a |
| children | 46d881ed5491 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-ems.el lisp/gnus/gnus-html.el |
| diffstat | 3 files changed, 17 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Aug 30 23:24:56 2010 +0000 +++ b/lisp/gnus/ChangeLog Mon Aug 30 23:29:56 2010 +0000 @@ -1,5 +1,10 @@ 2010-08-30 Lars Magne Ingebrigtsen <larsi@gnus.org> + * gnus-html.el (gnus-html-put-image): Use gnus-put-image. + + * gnus-ems.el (gnus-put-image): Have gnus-put-image take an optional + point parameter. + * gnus-group.el (gnus-group-completing-read): Add 'substring to completion-styles for group selection.
--- a/lisp/gnus/gnus-ems.el Mon Aug 30 23:24:56 2010 +0000 +++ b/lisp/gnus/gnus-ems.el Mon Aug 30 23:29:56 2010 +0000 @@ -274,13 +274,15 @@ (setq props (plist-put props :background (face-background face)))) (apply 'create-image file type data-p props))) -(defun gnus-put-image (glyph &optional string category) - (let ((point (point))) - (insert-image glyph (or string " ")) - (put-text-property point (point) 'gnus-image-category category) - (unless string - (put-text-property (1- (point)) (point) - 'gnus-image-text-deletable t)) +(defun gnus-put-image (glyph &optional string category point) + (let ((point (or point (point)))) + (save-excursion + (goto-char point) + (put-image glyph point) + (put-text-property point (point) 'gnus-image-category category) + (unless string + (put-text-property (1- (point)) (point) + 'gnus-image-text-deletable t))) glyph)) (defun gnus-remove-image (image &optional category)
--- a/lisp/gnus/gnus-html.el Mon Aug 30 23:24:56 2010 +0000 +++ b/lisp/gnus/gnus-html.el Mon Aug 30 23:29:56 2010 +0000 @@ -171,11 +171,11 @@ (= (car (image-size image t)) 30) (= (cdr (image-size image t)) 30)))) (progn - (put-image image point) + (gnus-put-image image nil nil point) t) (when (fboundp 'find-image) - (put-image (find-image '((:type xpm :file "lock-broken.xpm"))) - point)) + (gnus-put-image (find-image '((:type xpm :file "lock-broken.xpm"))) + nil nil point)) nil))) (defun gnus-html-prune-cache ()