2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fd32d19e3a..b4b2d687e85 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+        * international/mule-diag.el (list-input-methods-1):
+        Indent all lines of multi-line doc-strings.  (Bug#8066)
+
 2011-02-18  Chong Yidong  <cyd@stupidchicken.com>
 
         Fix 2011-02-02 changes.
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 349430f0cd9..d9ac587231e 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1056,7 +1056,10 @@ installed LEIM (Libraries of Emacs Input Methods).")
                          (if (and (consp title) (stringp (car title)))
                              (car title)
                            title))
-                       (nth 4 elt)))))))
+                       ;; If the doc is multi-line, indent all
+                       ;; non-blank lines. (Bug#8066)
+                       (replace-regexp-in-string "\n\\(.\\)" "\n    \\1"
+                                                 (or (nth 4 elt) ""))))))))
 
 ;;; DIAGNOSIS