aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-10-19 08:19:45 +0000
committerKatsumi Yamaoka2010-10-19 08:19:45 +0000
commit2fe10446ee03d05506af9e787b56f4c2ca4ee956 (patch)
treed1049da1251c3e280098ee3ec1c09f3f29b9b7f5
parent83ffd5713dc075600abc9ddca56cddbe852b81ff (diff)
downloademacs-2fe10446ee03d05506af9e787b56f4c2ca4ee956.tar.gz
emacs-2fe10446ee03d05506af9e787b56f4c2ca4ee956.zip
shr.el: Fix last change.
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/shr.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fbbed031efe..4c77c73db1d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,6 +1,6 @@
12010-10-19 Katsumi Yamaoka <yamaoka@jpl.org> 12010-10-19 Katsumi Yamaoka <yamaoka@jpl.org>
2 2
3 * shr.el: Load kinsoku. 3 * shr.el: Load kinsoku if necessary.
4 (shr-kinsoku-shorten): New internal variable. 4 (shr-kinsoku-shorten): New internal variable.
5 (shr-find-fill-point): Make kinsoku shorten text line if 5 (shr-find-fill-point): Make kinsoku shorten text line if
6 shr-kinsoku-shorten is bound to non-nil. 6 shr-kinsoku-shorten is bound to non-nil.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 50e75323dba..d16899c14b7 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -32,7 +32,8 @@
32 32
33(eval-when-compile (require 'cl)) 33(eval-when-compile (require 'cl))
34(require 'browse-url) 34(require 'browse-url)
35(load "kinsoku" nil t) 35(unless (aref (char-category-set (make-char 'japanese-jisx0208 33 35)) ?>)
36 (load "kinsoku" nil t))
36 37
37(defgroup shr nil 38(defgroup shr nil
38 "Simple HTML Renderer" 39 "Simple HTML Renderer"