Update copyright year to 2015

[gnu-emacs] / lisp / international / mule-diag.el

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index d9ac587231e92b9ea78c40fcde3d7784b46132a1..42e78f9c904f5ad6c7b374781d33472c7491d2a3 100644 (file)
--- 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-2015 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)
@@ -825,10 +825,18 @@ but still contains full information about each coding system."
 The IGNORED argument is ignored."
   (print-list "name (opened by):" (aref font-info 0))
   (print-list "       full name:" (aref font-info 1))
+  (and (aref font-info 12)
+       (print-list "       file name:" (aref font-info 12)))
   (print-list "            size:" (format "%2d" (aref font-info 2)))
   (print-list "          height:" (format "%2d" (aref font-info 3)))
   (print-list " baseline-offset:" (format "%2d" (aref font-info 4)))
-  (print-list "relative-compose:" (format "%2d" (aref font-info 5))))
+  (print-list "relative-compose:" (format "%2d" (aref font-info 5)))
+  (print-list "  default-ascent:" (format "%2d" (aref font-info 6)))
+  (print-list "          ascent:" (format "%2d" (aref font-info 8)))
+  (print-list "         descent:" (format "%2d" (aref font-info 9)))
+  (print-list "   average-width:" (format "%2d" (aref font-info 11)))
+  (print-list "     space-width:" (format "%2d" (aref font-info 10)))
+  (print-list "       max-width:" (format "%2d" (aref font-info 7))))
 
 ;;;###autoload
 (defun describe-font (fontname)
@@ -958,7 +966,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))
@@ -1104,8 +1112,7 @@ system which uses fontsets)."
 
       (insert-section 2 "Display")
       (if window-system
-         (insert (format "Window-system: %s, version %s"
-                         window-system window-system-version))
+         (insert (format "Window-system: %s" window-system))
        (insert "Terminal: " (getenv "TERM")))
       (insert "\n\n")
 
@@ -1139,7 +1146,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