mule-diag.el fix for bug#8066.

* lisp/international/mule-diag.el (list-input-methods-1):
Indent all lines of multi-line doc-strings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fd32d19e3a03d8a032e250195790c17ab58b0b8..b4b2d687e8559b8090d8ae8aeee65457852a68ef 100644 (file)
--- 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 349430f0cd9ae88c90cae70a5b0bccc11d937f45..d9ac587231e92b9ea78c40fcde3d7784b46132a1 100644 (file)
--- 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) ""))))))))
 \f
 ;;; DIAGNOSIS