diff options
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/ja-dic-cnv.el | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el index 285a4a9ed03..e3a5f6721dc 100644 --- a/lisp/international/ja-dic-cnv.el +++ b/lisp/international/ja-dic-cnv.el @@ -45,15 +45,6 @@ ;; Name of a file to generate from SKK dictionary. (defvar ja-dic-filename "ja-dic.el") -;; To make a generated ja-dic.el smaller. -(define-coding-system 'iso-2022-7bit-short - "Like `iso-2022-7bit' but no ASCII designation before SPC." - :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 ...") (goto-char (point-min)) @@ -61,24 +52,22 @@ (insert ";; Setting okuri-ari entries.\n" "(skkdic-set-okuri-ari\n")) (while (not (eobp)) - (let ((from (point)) - to) - (end-of-line) - (setq to (point)) - - (with-current-buffer buf - (insert-buffer-substring skkbuf from to) - (beginning-of-line) - (insert "\"") - (search-forward " ") - (delete-char 1) ; delete the first '/' - (let ((p (point))) - (end-of-line) - (delete-char -1) ; delete the last '/' - (subst-char-in-region p (point) ?/ ? 'noundo)) - (insert "\"\n")) - - (forward-line 1))) + (if (/= (following-char) ?>) + (let ((from (point)) + (to (line-end-position))) + (with-current-buffer buf + (insert-buffer-substring skkbuf from to) + (beginning-of-line) + (insert "\"") + (search-forward " ") + (delete-char 1) ; delete the first '/' + (let ((p (point))) + (end-of-line) + (delete-char -1) ; delete the last '/' + (subst-char-in-region p (point) ?/ ? 'noundo)) + (insert "\"\n")))) + + (forward-line 1)) (with-current-buffer buf (insert ")\n\n"))) @@ -348,7 +337,7 @@ The name of generated file is specified by the variable `ja-dic-filename'." (erase-buffer) (buffer-disable-undo) (insert ";;; ja-dic.el --- dictionary for Japanese input method" - " -*-coding: iso-2022-jp; byte-compile-disable-print-circle:t; -*-\n" + " -*-coding: euc-japan; byte-compile-disable-print-circle:t; -*-\n" ";;\tGenerated by the command `skkdic-convert'\n" ";;\tDate: " (current-time-string) "\n" ";;\tOriginal SKK dictionary file: " @@ -410,7 +399,7 @@ The name of generated file is specified by the variable `ja-dic-filename'." ;; Save the working buffer. (set-buffer buf) (set-visited-file-name (expand-file-name ja-dic-filename dirname) t) - (set-buffer-file-coding-system 'iso-2022-7bit-short) + (set-buffer-file-coding-system 'euc-japan) (save-buffer 0)) (kill-buffer skkbuf) (switch-to-buffer buf))) |