Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-25

[gnu-emacs] / lisp / international / ja-dic-cnv.el

diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 113d00f572a742957f10d17240ac3cf647aa3b85..682a2a8f2b5286a385732b1cca39e475f16a2ea3 100644 (file)
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -46,12 +46,13 @@
 (defvar ja-dic-filename "ja-dic.el")
 
 ;; To make a generated ja-dic.el smaller.
-(make-coding-system
- 'iso-2022-7bit-short
- 2 ?J
+(define-coding-system 'iso-2022-7bit-short
  "Like `iso-2022-7bit' but no ASCII designation before SPC."
- '(ascii nil nil nil t t nil t)
- '((safe-charsets . t)))
+  :coding-type 'iso-2022
+  :mnemonic ?J
+  :charset-list 'iso-2022
+  :designation [(ascii t) nil nil nil]
+  :flags '(short 7-bit designation))
 
 (defun skkdic-convert-okuri-ari (skkbuf buf)
   (message "Processing OKURI-ARI entries ...")
@@ -162,7 +163,7 @@
   (save-excursion
     (set-buffer buf)
     (insert ")\n\n")))
-         
+
 (defconst skkdic-prefix-list '(skkdic-prefix-list))
 
 (defun skkdic-convert-prefix (skkbuf buf)
@@ -192,7 +193,7 @@
   (save-excursion
     (set-buffer buf)
     (insert ")\n\n")))
-         
+
 ;; FROM and TO point the head and tail of "/J../J../.../".
 (defun skkdic-get-candidate-list (from to)
   (let (candidates)
@@ -281,8 +282,8 @@
       (setq candidates (cdr candidates)))
     (nreverse l)))
 
-(defconst skkdic-okuri-nasi-entries (list nil))
-(defconst skkdic-okuri-nasi-entries-count 0)
+(defvar skkdic-okuri-nasi-entries (list nil))
+(defvar skkdic-okuri-nasi-entries-count 0)
 
 (defun skkdic-collect-okuri-nasi ()
   (message "Collecting OKURI-NASI entries ...")
@@ -358,7 +359,8 @@ The name of generated file is specified by the variable `ja-dic-filename'."
       (set-buffer buf)
       (erase-buffer)
       (buffer-disable-undo)
-      (insert ";;; ja-dic.el --- dictionary for Japanese input method\n"
+      (insert ";;; ja-dic.el --- dictionary for Japanese input method"
+             " -*-coding: iso-2022-jp;-*-\n"
              ";;\tGenerated by the command `skkdic-convert'\n"
              ";;\tDate: " (current-time-string) "\n"
              ";;\tOriginal SKK dictionary file: "
@@ -406,7 +408,7 @@ The name of generated file is specified by the variable `ja-dic-filename'."
        (goto-char to)
        (skkdic-convert-prefix skkbuf buf)
 
-       ;; 
+       ;;
        (skkdic-collect-okuri-nasi)
 
        ;; Convert okuri-nasi general entries.
@@ -475,7 +477,7 @@ To get complete usage, invoke:
                (- ch)                  ;  represented by a negative code.
              (if (= ch ?\e$B!<\e(B)              ; `\e$B!<\e(B' is represented by 0.
                  0
-               (- (nth 2 (split-char ch)) 32))))
+               (- (logand (encode-char ch 'japanese-jisx0208) #xFF) 32))))
       (setq i (1+ i)))
     vec))
 
@@ -567,4 +569,5 @@ To get complete usage, invoke:
 ;; coding: iso-2022-7bit
 ;; End:
 
+;;; arch-tag: dec06fb0-8118-45b1-80d7-dc360b6fd3b2
 ;;; ja-dic-cnv.el ends here