shr,el: Allow shr table char to be customized.

gnus-gravatar.el (gnus-gravatar-transform-address): Error errors when retrieving gravatars.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 744601b8bc99f7b4e26b4e52284e8102532c7cfe..8184183c451c89a34df044317c014bb802f878a0 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-09  Julien Danjou  <julien@danjou.info>
+
+       * gnus-gravatar.el (gnus-gravatar-transform-address): Error errors when
+       retrieving gravatars.
+
+       * shr.el (shr-table-corner): Add.
+       (shr-table-line): Add.
+       (shr-insert-table-ruler): Use the above defcustoms to insert tables.
+
 2010-10-08  Julien Danjou  <julien@danjou.info>
 
        * mm-decode.el (mm-text-html-renderer): Add mm-shr in choice list.

diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index 97f4ba7359bbb2384ba9bce3110ec592fbcf4ded..9c1302743754a760bf69d94d4830c93072eda633 100644 (file)
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -68,10 +68,11 @@
                           (and (cdr address)
                                (string-match gnus-gravatar-too-ugly
                                              (cdr address)))))
-           (gravatar-retrieve
-            (car address)
-            'gnus-gravatar-insert
-            (list header address category))))))))
+           (ignore-errors
+              (gravatar-retrieve
+               (car address)
+               'gnus-gravatar-insert
+               (list header address category)))))))))
 
 (defun gnus-gravatar-insert (gravatar header address category)
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index daafa61d37275420eb7df30748d9d21513f95244..8f246a06e36db8637402e085a1241a5a98a8ed5e 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -53,6 +53,16 @@ fit these criteria."
   :group 'shr
   :type 'regexp)
 
+(defcustom shr-table-line ?-
+  "Character used to draw table line."
+  :group 'shr
+  :type 'char)
+
+(defcustom shr-table-corner ?+
+  "Charater used to draw table corner."
+  :group 'shr
+  :type 'char)
+
 (defvar shr-content-function nil
   "If bound, this should be a function that will return the content.
 This is used for cid: URLs, and the function is called with the
@@ -532,9 +542,9 @@ Return a string with image data."
 
 (defun shr-insert-table-ruler (widths)
   (shr-indent)
-  (insert "+")
+  (insert shr-table-corner)
   (dotimes (i (length widths))
-    (insert (make-string (aref widths i) ?-) ?+))
+    (insert (make-string (aref widths i) shr-table-line) shr-table-corner))
   (insert "\n"))
 
 (defun shr-table-widths (table suggested-widths)