X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/322b7dab59b98b5d8625d2cd29e48f1ce605f769..bdda4855c635ecf4135e23321bdba023e9ae65c9:/lisp/disp-table.el

diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 3befedac25..fe18add754 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -1,11 +1,11 @@
 ;;; disp-table.el --- functions for dealing with char tables
 
-;; Copyright (C) 1987, 1994-1995, 1999, 2001-2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1994-1995, 1999, 2001-2016 Free Software
+;; Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Based on a previous version by Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 ;; Package: emacs
 
@@ -119,7 +119,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
 (defun describe-current-display-table ()
   "Describe the display table in use in the selected window and buffer."
   (interactive)
-  (let ((disptab (or (window-display-table (selected-window))
+  (let ((disptab (or (window-display-table)
 		     buffer-display-table
 		     standard-display-table)))
     (if disptab
@@ -281,7 +281,8 @@ in `.emacs'."
 	       (set-terminal-coding-system nil))))
 
     (display-warning 'i18n
-		     "`standard-display-european' is semi-obsolete; see its doc string for details"
+		     (format-message
+		      "`standard-display-european' is semi-obsolete; see its doc string for details")
 		     :warning)
 
     ;; Switch to Latin-1 language environment