Indent.

[gnus] / lisp / shr.el

diff --git a/lisp/shr.el b/lisp/shr.el
index 1cdd6a7..e5bd5b0 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -56,17 +56,17 @@ fit these criteria."
 (defcustom shr-table-line ?-
   "Character used to draw table line."
   :group 'shr
-  :type 'char)
+  :type 'character)
 
 (defcustom shr-table-corner ?+
   "Character used to draw table corner."
   :group 'shr
-  :type 'char)
+  :type 'character)
 
 (defcustom shr-hr-line ?-
   "Character used to draw hr line."
   :group 'shr
-  :type 'char)
+  :type 'character)
 
 (defcustom shr-width fill-column
   "Frame width to use for rendering."
@@ -235,7 +235,7 @@ redirects somewhere else."
 (defun shr-find-fill-point ()
   (let ((found nil))
     (while (and (not found)
-               (not (bolp)))
+               (> (current-column) shr-indentation))
       (when (and (or (eq (preceding-char) ? )
                     (aref fill-find-break-point-function-table
                           (preceding-char)))
@@ -379,9 +379,10 @@ Return a string with image data."
        shr-start)
     (shr-generic cont)
     (widget-convert-button
-     'link (or shr-start start) (point)
-     :help-echo url)
-    (put-text-property (or shr-start start) (point) 'keymap shr-map)
+     'url-link (or shr-start start) (point)
+     :help-echo url
+     :keymap shr-map
+     url)
     (put-text-property (or shr-start start) (point) 'shr-url url)))
 
 (defun shr-encode-url (url)
@@ -403,14 +404,17 @@ Return a string with image data."
             (width (string-to-number width)))
         (when (< width max-width)
           (let ((align (cdr (assq :align cont))))
-            (cond ((string= align "right")
-                   (insert (propertize
-                            " " 'display
-                            `(space . (:align-to ,(list (- max-width width)))))))
-                  ((string= align "center")
-                   (insert (propertize
-                            " " 'display
-                            `(space . (:balign-to ,(list (- (/ max-width 2) width))))))))))))
+            (cond
+            ((string= align "right")
+             (insert (propertize
+                      " " 'display
+                      `(space . (:align-to
+                                 ,(list (- max-width width)))))))
+            ((string= align "center")
+             (insert (propertize
+                      " " 'display
+                      `(space . (:balign-to
+                                 ,(list (- (/ max-width 2) width))))))))))))
     (let ((start (point-marker)))
       (when (zerop (length alt))
         (setq alt "[img]"))