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 fa5a7ebe7c33590a86b91b90b18f03212d134796..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)
 
@@ -1121,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"))