From 8028ed5c1cf7a67264689790a6f7160e86160486 Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 4 Oct 2010 13:17:48 +0000
Subject: [PATCH] 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.

---
 lisp/gnus/ChangeLog |  3 +++
 lisp/gnus/shr.el    | 16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0fe882c8f21..33a760eb6f2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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  <julien@danjou.info>
 
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 564234bea92..c2c2c2ed280 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -220,6 +220,7 @@ fit these criteria."
     (shr-ensure-newline)))
 
 (defun shr-tag-blockquote (cont)
+  (shr-ensure-paragraph)
   (let ((shr-indentation (+ shr-indentation 4)))
     (shr-generic cont)))
 
@@ -289,12 +290,15 @@ Return a string with image data."
 
 (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)
-- 
2.39.2