Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 0b64a23..a6a243a 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -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

diff --git a/lisp/shr.el b/lisp/shr.el
index 6bea1f4..2b26a79 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -30,6 +30,26 @@
 
 ;;; Code:
 
+(defgroup shr nil
+  "Simple HTML Renderer"
+  :group 'mail)
+
+(defcustom shr-max-image-proportion 0.9
+  "How big pictures displayed are in relation to the window they're in.
+A value of 0.7 means that they are allowed to take up 70% of the
+width and height of the window.  If they are larger than this,
+and Emacs supports it, then the images will be rescaled down to
+fit these criteria."
+  :version "24.1"
+  :group 'shr
+  :type 'float)
+
+(defcustom shr-blocked-images nil
+  "Images that have URLs matching this regexp will be blocked."
+  :version "24.1"
+  :group 'shr
+  :type 'regexp)
+
 (defvar shr-folding-mode nil)
 
 (defvar shr-width 70)
@@ -90,17 +110,37 @@
 (defun shr-add-font (start end type)
   (put-text-property start end 'face type))
 
+(defun shr-a (cont)
+  (let ((start (point))
+       (url (cdr (assq :href cont))))
+    (shr-generic cont)
+    (widget-convert-button
+     'link start (point)
+     :action 'shr-browse-url
+     :url url
+     :keymap widget-keymap
+     :help-echo url)))
+
+(defun shr-browse-url (widget &rest stuff)
+  (browse-url (widget-get widget :url)))
+
 (defun shr-img (cont)
-  (shr-ensure-newline)
   (let ((start (point-marker)))
-    (let ((alt (or (cdr (assq :alt cont)) "[img]"))
+    (let ((alt (cdr (assq :alt cont)))
          (url (cdr (assq :src cont))))
-      (if (url-is-cached url)
-         (shr-put-image (shr-get-image-data url) (point) alt)
+      (when (zerop (length alt))
+       (setq alt "[img]"))
+      (cond
+       ((and shr-blocked-images
+            (string-match shr-blocked-images url))
+       (insert alt))
+       ((url-is-cached url)
+       (shr-put-image (shr-get-image-data url) (point) alt))
+       (t
        (insert alt)
        (url-retrieve url 'shr-image-fetched
                      (list (current-buffer) start (point-marker)))))
-    (shr-ensure-newline)))
+      (insert " "))))
 
 (defun shr-image-fetched (status buffer start end)
   (when (and (buffer-name buffer)
@@ -119,9 +159,36 @@
 (defun shr-put-image (data point alt)
   (if (not (display-graphic-p))
       (insert alt)
-    (let ((image (create-image data nil t)))
+    (let ((image (shr-rescale-image data)))
       (put-image image point alt))))
 
+(defun shr-rescale-image (data)
+  (if (or (not (fboundp 'imagemagick-types))
+         (not (get-buffer-window (current-buffer))))
+      (create-image data nil t)
+    (let* ((image (create-image data nil t))
+          (size (image-size image))
+          (width (car size))
+          (height (cdr size))
+          (edges (window-inside-pixel-edges
+                  (get-buffer-window (current-buffer))))
+          (window-width (truncate (* shr-max-image-proportion
+                                     (- (nth 2 edges) (nth 0 edges)))))
+          (window-height (truncate (* shr-max-image-proportion
+                                      (- (nth 3 edges) (nth 1 edges)))))
+          scaled-image)
+      (when (> height window-height)
+       (setq image (or (create-image data 'imagemagick t
+                                     :height window-height)
+                       image))
+       (setq size (image-size image t)))
+      (when (> (car size) window-width)
+       (setq image (or
+                    (create-image data 'imagemagick t
+                                  :width window-width)
+                    image)))
+      image)))
+
 (defun shr-pre (cont)
   (let ((shr-folding-mode nil))
     (shr-ensure-newline)