Remove compatibility with Emacs 24.3 in octave-mode

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

diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index e9bdd3d9be3758e3d98f2d4c66334beb754d1c44..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, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 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
 
@@ -94,14 +94,32 @@ Valid symbols are `truncation', `wrap', `escape', `control',
        (while (< i 256)
          (aset vector i (aref dt i))
          (setq i (1+ i)))
-       (describe-vector vector))
+       (describe-vector
+        vector 'display-table-print-array))
       (help-mode))))
 
+(defun display-table-print-array (desc)
+  (insert "[")
+  (let ((column (current-column))
+       (width (window-width))
+       string)
+    (dotimes (i (length desc))
+      (setq string (format "%s" (aref desc i)))
+      (cond
+       ((>= (+ (current-column) (length string) 1)
+           width)
+       (insert "\n")
+       (insert (make-string column ? )))
+       ((> i 0)
+       (insert " ")))
+      (insert string)))
+  (insert "]\n"))
+
 ;;;###autoload
 (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
@@ -263,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
@@ -281,5 +300,4 @@ in `.emacs'."
 
 (provide 'disp-table)
 
-;; arch-tag: ffe4c28c-960c-47aa-b8a8-ae89d371ffc7
 ;;; disp-table.el ends here