Add a couple cells to lisp-prettify-symbols-alist

[gnu-emacs] / lisp / disp-table.el

diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index a900ab2f96680b7df9944f8c2b751b8051185cff..fe18add754863c4f2fc0cb9e1f73767b45d849cb 100644 (file)
--- 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-2012
-;;   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