Prefer 'frame-parameter' where it is expected to be a bit faster

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

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 028c9916faf5781db45e2357dedf26d2ac9c8611..f543083b8c5b18c9cca3cac9c1c93f95d602f352 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-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2016 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)
@@ -204,13 +204,6 @@ Character sets for defining other charsets, or for backward compatibility
   "Obsolete.")
 (make-obsolete-variable 'non-iso-charset-alist "no longer relevant." "23.1")
 
-(defun decode-codepage-char (codepage code)
-  "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))
-
 ;; A variable to hold charset input history.
 (defvar charset-history nil)
 
@@ -332,7 +325,7 @@ meanings of these arguments."
       (let ((char (charset-iso-final-char charset)))
        (when (> char 0)
          (insert "Final char of ISO2022 designation sequence: ")
-         (insert (format-message "‘%c’\n" char))))
+         (insert (format-message "`%c'\n" char))))
       (let (aliases)
        (dolist (c charset-list)
          (if (and (not (eq c charset))
@@ -1038,7 +1031,8 @@ see the function `describe-fontset' for the format of the list."
       (save-excursion
        (goto-char (point-min))
        (while (re-search-forward
-               "^  \\([^ ]+\\) (‘.*’ in mode line)$" nil t)
+               (substitute-command-keys "^  \\([^ ]+\\) (`.*' in mode line)$")
+                nil t)
          (help-xref-button 1 'help-input-method (match-string 1)))))))
 
 (defun list-input-methods-1 ()
@@ -1046,7 +1040,8 @@ see the function `describe-fontset' for the format of the list."
       (princ "
 No input method is available, perhaps because you have not
 installed LEIM (Libraries of Emacs Input Methods).")
-    (princ "LANGUAGE\n  NAME (‘TITLE’ in mode line)\n")
+    (princ (substitute-command-keys
+            "LANGUAGE\n  NAME (`TITLE' in mode line)\n"))
     (princ "    SHORT-DESCRIPTION\n------------------------------\n")
     (setq input-method-alist
          (sort input-method-alist
@@ -1059,7 +1054,7 @@ installed LEIM (Libraries of Emacs Input Methods).")
          (princ language)
          (terpri))
        (princ (format-message
-                "  %s (‘%s’ in mode line)\n    %s\n"
+                "  %s (`%s' in mode line)\n    %s\n"
                 (car elt)
                 (let ((title (nth 3 elt)))
                   (if (and (consp title) (stringp (car title)))
@@ -1119,7 +1114,7 @@ system which uses fontsets)."
       (insert "\n\n")
 
       (if window-system
-         (let ((font (cdr (assq 'font (frame-parameters)))))
+         (let ((font (frame-parameter nil 'font)))
            (insert "The font and fontset of the selected frame are:\n"
                    "     font: " font "\n"
                    "  fontset: " (face-attribute 'default :fontset) "\n"))