HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk
[bpt/emacs.git]
/
lisp
/
disp-table.el
diff --git
a/lisp/disp-table.el
b/lisp/disp-table.el
index
86aed27
..
a900ab2
100644
(file)
--- a/
lisp/disp-table.el
+++ b/
lisp/disp-table.el
@@
-1,12
+1,13
@@
;;; disp-table.el --- functions for dealing with char tables
;;; 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-2012
+;; Free Software Foundation, Inc.
;; Author: Erik Naggum <erik@naggum.no>
;; Based on a previous version by Howard Gayle
;; Maintainer: FSF
;; Keywords: i18n
;; Author: Erik Naggum <erik@naggum.no>
;; Based on a previous version by Howard Gayle
;; Maintainer: FSF
;; Keywords: i18n
+;; Package: emacs
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-93,9
+94,27
@@
Valid symbols are `truncation', `wrap', `escape', `control',
(while (< i 256)
(aset vector i (aref dt i))
(setq i (1+ i)))
(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))))
(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."
;;;###autoload
(defun describe-current-display-table ()
"Describe the display table in use in the selected window and buffer."
@@
-280,5
+299,4
@@
in `.emacs'."
(provide 'disp-table)
(provide 'disp-table)
-;; arch-tag: ffe4c28c-960c-47aa-b8a8-ae89d371ffc7
;;; disp-table.el ends here
;;; disp-table.el ends here