X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8678d9e413593b0abab296551a20589745c459da..71719263212fea7f8b90acef6160497d08da75c4:/lisp/international/mule-diag.el

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 349430f0cd..4873a5c835 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1,6 +1,6 @@
 ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
 
-;; Copyright (C) 1997-1998, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2013 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -208,8 +208,8 @@ Character sets for defining other charsets, or for backward compatibility
   "Decode a character that has code CODE in CODEPAGE.
 Return a decoded character string.  Each CODEPAGE corresponds to a
 coding system cpCODEPAGE."
+  (declare (obsolete decode-char "23.1"))
   (decode-char (intern (format "cp%d" codepage)) code))
-(make-obsolete 'decode-codepage-char 'decode-char "23.1")
 
 ;; A variable to hold charset input history.
 (defvar charset-history nil)
@@ -958,7 +958,7 @@ the current buffer."
 	(insert "\n  ---<fallback to the default of the default fontset>---")
 	(put-text-property (line-beginning-position) (point) 'face 'highlight)))
       (if (and start1 end2)
-	  ;; Reoder the printed information to match with the font
+	  ;; Reorder the printed information to match with the font
 	  ;; searching strategy; i.e. FONTSET, the default fontset,
 	  ;; default of FONTSET, default of the default fontset.
 	  (transpose-regions start1 end1 start2 end2))
@@ -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
 
@@ -1136,7 +1139,8 @@ system which uses fontsets)."
 	(insert "Fontset-Name\t\t\t\t\t\t  WDxHT Style\n")
 	(insert "------------\t\t\t\t\t\t  ----- -----\n")
 	(dolist (fontset (fontset-list))
-	  (print-fontset fontset t)))
+	  (print-fontset fontset t)
+	  (insert "\n")))
       (help-print-return-message))))
 
 ;;;###autoload