aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2003-10-28 06:53:41 +0000
committerKenichi Handa2003-10-28 06:53:41 +0000
commita77a4db4953f6e9c955dbcec797b50e1b2df238a (patch)
tree3ae08e5cbdb0d505367f4d44a9afdd1ab965b4cb
parentf67b6c12766d0ba5768cf31344ad112b54e5d694 (diff)
downloademacs-a77a4db4953f6e9c955dbcec797b50e1b2df238a.tar.gz
emacs-a77a4db4953f6e9c955dbcec797b50e1b2df238a.zip
* 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.
-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 @@
12003-10-28 Kenichi Handa <handa@etlken2>
2
3 * disp-table.el (standard-display-8bit)
4 (standard-display-default, standard-display-ascii)
5 (standard-display-g1, standard-display-graphic)
6 (standard-display-underline): Assure that standard-display-table
7 is a display table.
8
12003-10-27 Stefan Monnier <monnier@iro.umontreal.ca> 92003-10-27 Stefan Monnier <monnier@iro.umontreal.ca>
2 10
3 * simple.el (reindent-then-newline-and-indent): Delete space *after* 11 * 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',
113;;;###autoload 113;;;###autoload
114(defun standard-display-8bit (l h) 114(defun standard-display-8bit (l h)
115 "Display characters in the range L to H literally." 115 "Display characters in the range L to H literally."
116 (or standard-display-table
117 (setq standard-display-table (make-display-table)))
116 (while (<= l h) 118 (while (<= l h)
117 (if (and (>= l ?\ ) (< l 127)) 119 (if (and (>= l ?\ ) (< l 127))
118 (aset standard-display-table l nil) 120 (aset standard-display-table l nil)
@@ -122,6 +124,8 @@ Valid symbols are `truncation', `wrap', `escape', `control',
122;;;###autoload 124;;;###autoload
123(defun standard-display-default (l h) 125(defun standard-display-default (l h)
124 "Display characters in the range L to H using the default notation." 126 "Display characters in the range L to H using the default notation."
127 (or standard-display-table
128 (setq standard-display-table (make-display-table)))
125 (while (<= l h) 129 (while (<= l h)
126 (if (and (>= l ?\ ) (char-valid-p l)) 130 (if (and (>= l ?\ ) (char-valid-p l))
127 (aset standard-display-table l nil)) 131 (aset standard-display-table l nil))
@@ -133,6 +137,8 @@ Valid symbols are `truncation', `wrap', `escape', `control',
133;;;###autoload 137;;;###autoload
134(defun standard-display-ascii (c s) 138(defun standard-display-ascii (c s)
135 "Display character C using printable string S." 139 "Display character C using printable string S."
140 (or standard-display-table
141 (setq standard-display-table (make-display-table)))
136 (aset standard-display-table c (vconcat s))) 142 (aset standard-display-table c (vconcat s)))
137 143
138;;;###autoload 144;;;###autoload
@@ -142,6 +148,8 @@ This function assumes that your terminal uses the SO/SI characters;
142it is meaningless for an X frame." 148it is meaningless for an X frame."
143 (if (memq window-system '(x w32)) 149 (if (memq window-system '(x w32))
144 (error "Cannot use string glyphs in a windowing system")) 150 (error "Cannot use string glyphs in a windowing system"))
151 (or standard-display-table
152 (setq standard-display-table (make-display-table)))
145 (aset standard-display-table c 153 (aset standard-display-table c
146 (vector (create-glyph (concat "\016" (char-to-string sc) "\017"))))) 154 (vector (create-glyph (concat "\016" (char-to-string sc) "\017")))))
147 155
@@ -152,12 +160,16 @@ This function assumes VT100-compatible escapes; it is meaningless for an
152X frame." 160X frame."
153 (if (memq window-system '(x w32)) 161 (if (memq window-system '(x w32))
154 (error "Cannot use string glyphs in a windowing system")) 162 (error "Cannot use string glyphs in a windowing system"))
163 (or standard-display-table
164 (setq standard-display-table (make-display-table)))
155 (aset standard-display-table c 165 (aset standard-display-table c
156 (vector (create-glyph (concat "\e(0" (char-to-string gc) "\e(B"))))) 166 (vector (create-glyph (concat "\e(0" (char-to-string gc) "\e(B")))))
157 167
158;;;###autoload 168;;;###autoload
159(defun standard-display-underline (c uc) 169(defun standard-display-underline (c uc)
160 "Display character C as character UC plus underlining." 170 "Display character C as character UC plus underlining."
171 (or standard-display-table
172 (setq standard-display-table (make-display-table)))
161 (aset standard-display-table c 173 (aset standard-display-table c
162 (vector 174 (vector
163 (if window-system 175 (if window-system