mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes made in Gnus trunk.

Browse source 
shr.el: Start implementation.
shr.el: Continue implementation.
gnus-gravatar.el (gnus-gravatar-insert): Adjust character where we should go backward.
shr.el: Minimally useful state achieved.
mm-decode.el (mm-text-html-renderer): Switch to using shr.el for HTML rendering.
shr.el: (shr-insert): Add a newline after every picture before text.
gnus.texi (Splitting Mail): Really fix the @ref syntax.
shr.el (shr-add-font): Use overlays for combining faces.
shr.el (shr-add-font): Use overlays for combining faces.
shr.el (shr-insert): Pass upwards the text start point.
gnus-util.el: Reintroduce multiple completion functions.
This commit is contained in:
Gnus developers 2010-10-03 00:33:27 +00:00 • committed by Katsumi Yamaoka
parent 2a847524ab
commit 870409d4fb
8 changed files with 317 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lisp/gnus/gnus-html.el
View file

@ -402,7 +402,8 @@ Return a string with image data."
(defun gnus-html-put-image (data url &optional alt-text)
(when (gnus-graphic-display-p)
(let* ((start (text-property-any (point-min) (point-max) 'gnus-image-url url))
(let* ((start (text-property-any (point-min) (point-max)
'gnus-image-url url))
(end (when start
(next-single-property-change start 'gnus-image-url))))
;; Image found?
@ -416,7 +417,8 @@ Return a string with image data."
(image-size image t)))))
(save-excursion
(goto-char start)
(let ((alt-text (or alt-text (buffer-substring-no-properties start end))))
(let ((alt-text (or alt-text
(buffer-substring-no-properties start end))))
(if (and image
;; Kludge to avoid displaying 30x30 gif images, which
;; seems to be a signal of a broken image.
@ -424,8 +426,9 @@ Return a string with image data."
(glyphp image)
(listp image))
(eq (if (featurep 'xemacs)
(let ((d (cdadar (specifier-spec-list
(glyph-image image)))))
(let ((d (cdadar
(specifier-spec-list
(glyph-image image)))))
(and (vectorp d)
(aref d 0)))
(plist-get (cdr image) :type))
@ -437,17 +440,21 @@ Return a string with image data."
(delete-region start end)
(gnus-put-image image alt-text 'external)
(gnus-put-text-property start (point) 'help-echo alt-text)
(gnus-overlay-put (gnus-make-overlay start (point)) 'local-map
gnus-html-displayed-image-map)
(gnus-put-text-property start (point) 'gnus-alt-text alt-text)
(gnus-overlay-put
(gnus-make-overlay start (point)) 'local-map
gnus-html-displayed-image-map)
(gnus-put-text-property start (point)
'gnus-alt-text alt-text)
(when url
(gnus-put-text-property start (point) 'gnus-image-url url))
(gnus-put-text-property start (point)
'gnus-image-url url))
(gnus-add-image 'external image)
t)
;; Bad image, try to show something else
(when (fboundp 'find-image)
(delete-region start end)
(setq image (find-image '((:type xpm :file "lock-broken.xpm"))))
(setq image (find-image
'((:type xpm :file "lock-broken.xpm"))))
(gnus-put-image image alt-text 'internal)
(gnus-add-image 'internal image))
nil))))))))
@ -458,7 +465,8 @@ Return a string with image data."
image
(let* ((width (car size))
(height (cdr size))
(edges (gnus-window-inside-pixel-edges (get-buffer-window (current-buffer))))
(edges (gnus-window-inside-pixel-edges
(get-buffer-window (current-buffer))))
(window-width (truncate (* gnus-max-image-proportion
(- (nth 2 edges) (nth 0 edges)))))
(window-height (truncate (* gnus-max-image-proportion