gnus-util.el (gnus-macroexpand-all): Use eval-and-compile.

[gnus] / lisp / shr.el

diff --git a/lisp/shr.el b/lisp/shr.el
index 1eb629e..0b2fa93 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -32,8 +32,6 @@
 
 (eval-when-compile (require 'cl))
 (require 'browse-url)
 
 (eval-when-compile (require 'cl))
 (require 'browse-url)

-(unless (aref (char-category-set (make-char 'japanese-jisx0208 33 35)) ?>)
-  (load "kinsoku" nil t))

 
 (defgroup shr nil
   "Simple HTML Renderer"
 
 (defgroup shr nil
   "Simple HTML Renderer"


@@ -55,18 +53,23 @@ fit these criteria."
   :group 'shr
   :type 'regexp)
 
   :group 'shr
   :type 'regexp)
 

-(defcustom shr-table-line ?-
-  "Character used to draw table line."
+(defcustom shr-table-horizontal-line ?-
+  "Character used to draw horizontal table lines."
+  :group 'shr
+  :type 'character)
+
+(defcustom shr-table-vertical-line ?|
+  "Character used to draw vertical table lines."

   :group 'shr
   :type 'character)
 
 (defcustom shr-table-corner ?+
   :group 'shr
   :type 'character)
 
 (defcustom shr-table-corner ?+

-  "Character used to draw table corner."
+  "Character used to draw table corners."

   :group 'shr
   :type 'character)
 
 (defcustom shr-hr-line ?-
   :group 'shr
   :type 'character)
 
 (defcustom shr-hr-line ?-

-  "Character used to draw hr line."
+  "Character used to draw hr lines."

   :group 'shr
   :type 'character)
 
&