(shr-tag-li): Get <li> indentation even righter.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0763577..8aff491 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,7 @@
        (shr-insert): Tweak line breaking.
        (shr-insert): Handle <pre> better.
        (shr-tag-li): Get <li> indentation right.
+       (shr-tag-li): Get <li> indentation even righter.
 
 2010-10-04  Julien Danjou  <julien@danjou.info>
 

diff --git a/lisp/shr.el b/lisp/shr.el
index cca3de5..494e761 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -289,12 +289,14 @@ Return a string with image data."
 
 (defun shr-tag-li (cont)
   (shr-ensure-newline)
-  (let ((shr-indentation (+ shr-indentation 2)))
-    (if (numberp shr-list-mode)
-       (progn
-         (insert (format "%d " shr-list-mode))
-         (setq shr-list-mode (1+ shr-list-mode)))
-      (insert "* "))
+  (let* ((bullet
+         (if (numberp shr-list-mode)
+             (prog1
+                 (format "%d " shr-list-mode)
+               (setq shr-list-mode (1+ shr-list-mode)))
+           "* "))
+        (shr-indentation (+ shr-indentation (length bullet))))
+    (insert bullet)
     (shr-generic cont)))
 
 (defun shr-tag-br (cont)