[Emacs-diffs] /srv/bzr/emacs/trunk r101785: shr.el (shr-tag-li): Get <li> indentation right.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101785
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-10-04 13:17:48 +0000
message:
  shr.el (shr-tag-li): Get <li> indentation right.
  shr.el (shr-tag-li): Get <li> indentation even righter.
  shr.el (shr-tag-blockquote): Ensure paragraph start.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-04 10:43:14 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-04 13:17:48 +0000
@@ -3,6 +3,9 @@
        * shr.el (shr-ensure-paragraph): Fix the non-empty line case.
        (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.
+       (shr-tag-blockquote): Ensure paragraph start.
 
 2010-10-04  Julien Danjou  <address@hidden>
 

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-04 10:43:14 +0000
+++ b/lisp/gnus/shr.el  2010-10-04 13:17:48 +0000
@@ -220,6 +220,7 @@
     (shr-ensure-newline)))
 
 (defun shr-tag-blockquote (cont)
+  (shr-ensure-paragraph)
   (let ((shr-indentation (+ shr-indentation 4)))
     (shr-generic cont)))
 
@@ -289,12 +290,15 @@
 
 (defun shr-tag-li (cont)
   (shr-ensure-newline)
-  (if (numberp shr-list-mode)
-      (progn
-       (insert (format "%d " shr-list-mode))
-       (setq shr-list-mode (1+ shr-list-mode)))
-    (insert "* "))
-  (shr-generic cont))
+  (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)
   (unless (bobp)