diff options
| author | Dave Love | 2002-05-13 18:27:28 +0000 |
|---|---|---|
| committer | Dave Love | 2002-05-13 18:27:28 +0000 |
| commit | fd334a5e61c64231a60997eba4bcf05d32e93509 (patch) | |
| tree | 95e830988efb0aca7f20948b9cf2257fe4c4e599 | |
| parent | 602493a815200093b3a76556116f1d56c279b032 (diff) | |
| download | emacs-fd334a5e61c64231a60997eba4bcf05d32e93509.tar.gz emacs-fd334a5e61c64231a60997eba4bcf05d32e93509.zip | |
Log for previous change:
(encoded-kbd-self-insert-ccl): Fix
getting decoder.
(encoded-kbd-mode): Fix code for coding system type and
designations.
| -rw-r--r-- | lisp/international/encoded-kb.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el index b243d7b3f72..2cdeba4baaf 100644 --- a/lisp/international/encoded-kb.el +++ b/lisp/international/encoded-kb.el | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. | 3 | ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. |
| 4 | ;; Licensed to the Free Software Foundation. | 4 | ;; Licensed to the Free Software Foundation. |
| 5 | ;; Copyright (C) 2002 Free Software Foundation, Inc. | ||
| 5 | 6 | ||
| 6 | ;; This file is part of GNU Emacs. | 7 | ;; This file is part of GNU Emacs. |
| 7 | 8 | ||
| @@ -307,13 +308,13 @@ as a multilingual text encoded in a coding system set by | |||
| 307 | (let ((coding (keyboard-coding-system))) | 308 | (let ((coding (keyboard-coding-system))) |
| 308 | (setq saved-input-mode (current-input-mode)) | 309 | (setq saved-input-mode (current-input-mode)) |
| 309 | (cond ((null coding) | 310 | (cond ((null coding) |
| 310 | (setq encoded-kbd-mode nil) | 311 | (setq encoded-kbd-mode nil) |
| 311 | (error "No coding system for keyboard input is set")) | 312 | (error "No coding system for keyboard input is set")) |
| 312 | 313 | ||
| 313 | ((eq (coding-system-type coding) 'sjis) | 314 | ((eq (coding-system-type coding) 'sjis) |
| 314 | (set-input-mode | 315 | (set-input-mode |
| 315 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) | 316 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) |
| 316 | 'use-8th-bit (nth 3 saved-input-mode)) | 317 | 'use-8th-bit (nth 3 saved-input-mode)) |
| 317 | (setq encoded-kbd-coding 'sjis)) | 318 | (setq encoded-kbd-coding 'sjis)) |
| 318 | 319 | ||
| 319 | ((eq (coding-system-type coding) 'iso-2022) | 320 | ((eq (coding-system-type coding) 'iso-2022) |
| @@ -321,7 +322,7 @@ as a multilingual text encoded in a coding system set by | |||
| 321 | (setq encoded-kbd-coding 'iso2022-7) | 322 | (setq encoded-kbd-coding 'iso2022-7) |
| 322 | (set-input-mode | 323 | (set-input-mode |
| 323 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) | 324 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) |
| 324 | 'use-8th-bit (nth 3 saved-input-mode)) | 325 | 'use-8th-bit (nth 3 saved-input-mode)) |
| 325 | (setq encoded-kbd-coding 'iso2022-8)) | 326 | (setq encoded-kbd-coding 'iso2022-8)) |
| 326 | (setq encoded-kbd-iso2022-designations | 327 | (setq encoded-kbd-iso2022-designations |
| 327 | (coding-system-get coding :designation)) | 328 | (coding-system-get coding :designation)) |
| @@ -332,13 +333,13 @@ as a multilingual text encoded in a coding system set by | |||
| 332 | ((eq (coding-system-type coding) 'big5) | 333 | ((eq (coding-system-type coding) 'big5) |
| 333 | (set-input-mode | 334 | (set-input-mode |
| 334 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) | 335 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) |
| 335 | 'use-8th-bit (nth 3 saved-input-mode)) | 336 | 'use-8th-bit (nth 3 saved-input-mode)) |
| 336 | (setq encoded-kbd-coding 'big5)) | 337 | (setq encoded-kbd-coding 'big5)) |
| 337 | 338 | ||
| 338 | ((eq (coding-system-type coding) 'ccl) | 339 | ((eq (coding-system-type coding) 'ccl) |
| 339 | (set-input-mode | 340 | (set-input-mode |
| 340 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) | 341 | (nth 0 saved-input-mode) (nth 1 saved-input-mode) |
| 341 | 'use-8th-bit (nth 3 saved-input-mode)) | 342 | 'use-8th-bit (nth 3 saved-input-mode)) |
| 342 | (setq encoded-kbd-coding 'ccl)) | 343 | (setq encoded-kbd-coding 'ccl)) |
| 343 | 344 | ||
| 344 | (t | 345 | (t |