diff options
| author | Kenichi Handa | 1997-07-09 06:56:04 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1997-07-09 06:56:04 +0000 |
| commit | c4ede6a24099d741088c99d16a3305b326f12b09 (patch) | |
| tree | 01d5a7f6c4aaebba3983a7f776d99acf7e2b700f | |
| parent | 2167d18d4048e71cfe5baa27f64c5015eeb77294 (diff) | |
| download | emacs-c4ede6a24099d741088c99d16a3305b326f12b09.tar.gz emacs-c4ede6a24099d741088c99d16a3305b326f12b09.zip | |
(encoded-kbd-mode): Call coding-system-XXX instead of coding-vector-XXX.
| -rw-r--r-- | lisp/international/encoded-kb.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el index 1da1f37dd61..afc3ee353e6 100644 --- a/lisp/international/encoded-kb.el +++ b/lisp/international/encoded-kb.el | |||
| @@ -237,26 +237,26 @@ set by the command `encoded-kbd-set-coding-system'" | |||
| 237 | (if (null arg) (null encoded-kbd-mode) | 237 | (if (null arg) (null encoded-kbd-mode) |
| 238 | (> (prefix-numeric-value arg) 0))) | 238 | (> (prefix-numeric-value arg) 0))) |
| 239 | (if encoded-kbd-mode | 239 | (if encoded-kbd-mode |
| 240 | (let* ((coding (coding-system-vector (keyboard-coding-system))) | 240 | (let ((coding (keyboard-coding-system)) |
| 241 | (input-mode (current-input-mode))) | 241 | (input-mode (current-input-mode))) |
| 242 | (cond ((null coding) | 242 | (cond ((null coding) |
| 243 | (setq encoded-kbd-mode nil) | 243 | (setq encoded-kbd-mode nil) |
| 244 | (error "No coding-system for terminal keyboard is set")) | 244 | (error "No coding-system for terminal keyboard is set")) |
| 245 | 245 | ||
| 246 | ((= (coding-vector-type coding) 1) ; SJIS | 246 | ((= (coding-system-type coding) 1) ; SJIS |
| 247 | (set-input-mode (nth 0 input-mode) (nth 1 input-mode) | 247 | (set-input-mode (nth 0 input-mode) (nth 1 input-mode) |
| 248 | 'use-8th-bit (nth 3 input-mode)) | 248 | 'use-8th-bit (nth 3 input-mode)) |
| 249 | (setq encoded-kbd-coding 'sjis)) | 249 | (setq encoded-kbd-coding 'sjis)) |
| 250 | 250 | ||
| 251 | ((= (coding-vector-type coding) 2) ; ISO2022 | 251 | ((= (coding-system-type coding) 2) ; ISO2022 |
| 252 | (if (aref (coding-vector-flags coding) 7) ; 7-bit only | 252 | (if (aref (coding-system-flags coding) 7) ; 7-bit only |
| 253 | (setq encoded-kbd-coding 'iso2022-7) | 253 | (setq encoded-kbd-coding 'iso2022-7) |
| 254 | (set-input-mode (nth 0 input-mode) (nth 1 input-mode) | 254 | (set-input-mode (nth 0 input-mode) (nth 1 input-mode) |
| 255 | 'use-8th-bit (nth 3 input-mode)) | 255 | 'use-8th-bit (nth 3 input-mode)) |
| 256 | (setq encoded-kbd-coding 'iso2022-8)) | 256 | (setq encoded-kbd-coding 'iso2022-8)) |
| 257 | (make-variable-buffer-local 'encoded-kbd-iso2022-designations) | 257 | (make-variable-buffer-local 'encoded-kbd-iso2022-designations) |
| 258 | (setq encoded-kbd-iso2022-designations (make-vector 4 nil)) | 258 | (setq encoded-kbd-iso2022-designations (make-vector 4 nil)) |
| 259 | (let ((flags (coding-vector-flags coding)) | 259 | (let ((flags (coding-system-flags coding)) |
| 260 | (i 0)) | 260 | (i 0)) |
| 261 | (while (< i 4) | 261 | (while (< i 4) |
| 262 | (if (charsetp (aref flags i)) | 262 | (if (charsetp (aref flags i)) |
| @@ -268,7 +268,7 @@ set by the command `encoded-kbd-set-coding-system'" | |||
| 268 | (aset encoded-kbd-iso2022-invocations 0 0) | 268 | (aset encoded-kbd-iso2022-invocations 0 0) |
| 269 | (aset encoded-kbd-iso2022-invocations 1 1)) | 269 | (aset encoded-kbd-iso2022-invocations 1 1)) |
| 270 | 270 | ||
| 271 | ((= (coding-vector-type coding) 3) ; BIG5 | 271 | ((= (coding-system-type coding) 3) ; BIG5 |
| 272 | (set-input-mode (nth 0 input-mode) (nth 1 input-mode) | 272 | (set-input-mode (nth 0 input-mode) (nth 1 input-mode) |
| 273 | 'use-8th-bit (nth 3 input-mode)) | 273 | 'use-8th-bit (nth 3 input-mode)) |
| 274 | (setq encoded-kbd-coding 'big5)) | 274 | (setq encoded-kbd-coding 'big5)) |