summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/disp-table.el12
2 files changed, 20 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 557e49eed2c..f8da573f603 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-28 Kenichi Handa <handa@etlken2>
+
+ * disp-table.el (standard-display-8bit)
+ (standard-display-default, standard-display-ascii)
+ (standard-display-g1, standard-display-graphic)
+ (standard-display-underline): Assure that standard-display-table
+ is a display table.
+
2003-10-27 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (reindent-then-newline-and-indent): Delete space *after*
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 028c293f221..6403b7de8b0 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -113,6 +113,8 @@ Valid symbols are `truncation', `wrap', `escape', `control',
;;;###autoload
(defun standard-display-8bit (l h)
"Display characters in the range L to H literally."
+ (or standard-display-table
+ (setq standard-display-table (make-display-table)))
(while (<= l h)
(if (and (>= l ?\ ) (< l 127))
(aset standard-display-table l nil)
@@ -122,6 +124,8 @@ Valid symbols are `truncation', `wrap', `escape', `control',
;;;###autoload
(defun standard-display-default (l h)
"Display characters in the range L to H using the default notation."
+ (or standard-display-table
+ (setq standard-display-table (make-display-table)))
(while (<= l h)
(if (and (>= l ?\ ) (char-valid-p l))
(aset standard-display-table l nil))
@@ -133,6 +137,8 @@ Valid symbols are `truncation', `wrap', `escape', `control',
;;;###autoload
(defun standard-display-ascii (c s)
"Display character C using printable string S."
+ (or standard-display-table
+ (setq standard-display-table (make-display-table)))
(aset standard-display-table c (vconcat s)))
;;;###autoload
@@ -142,6 +148,8 @@ This function assumes that your terminal uses the SO/SI characters;
it is meaningless for an X frame."
(if (memq window-system '(x w32))
(error "Cannot use string glyphs in a windowing system"))
+ (or standard-display-table
+ (setq standard-display-table (make-display-table)))
(aset standard-display-table c
(vector (create-glyph (concat "\016" (char-to-string sc) "\017")))))
@@ -152,12 +160,16 @@ This function assumes VT100-compatible escapes; it is meaningless for an
X frame."
(if (memq window-system '(x w32))
(error "Cannot use string glyphs in a windowing system"))
+ (or standard-display-table
+ (setq standard-display-table (make-display-table)))
(aset standard-display-table c
(vector (create-glyph (concat "\e(0" (char-to-string gc) "\e(B")))))
;;;###autoload
(defun standard-display-underline (c uc)
"Display character C as character UC plus underlining."
+ (or standard-display-table
+ (setq standard-display-table (make-display-table)))
(aset standard-display-table c
(vector
(if window-system