X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fshr.el;h=ee54e305f79b23de512a397209012e855173e6d9;hb=b0eccd76f35ef80c3ad13f09e588d49358e9c22a;hp=1cdd6a71f03cfa14dbeffee70d34c99b414a2f1c;hpb=c4c7fe99195a53c63df32717dce0da403ca0c58e;p=gnus

diff --git a/lisp/shr.el b/lisp/shr.el
index 1cdd6a71f..ee54e305f 100644
--- 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)