[Emacs-diffs] Changes to emacs/lisp/international/titdic-cnv.el [emacs-unicode-2]

[Kenichi Handa]

Index: emacs/lisp/international/titdic-cnv.el
diff -c emacs/lisp/international/titdic-cnv.el:1.36.6.3 
emacs/lisp/international/titdic-cnv.el:1.36.6.4
*** emacs/lisp/international/titdic-cnv.el:1.36.6.3     Mon Jun 28 07:29:47 2004
--- emacs/lisp/international/titdic-cnv.el      Tue Oct 19 11:09:12 2004
***************
*** 270,276 ****
        (tit-keyprompt nil))
  
      (princ ";; Quail package `")
!     (princ package) (princ "' -*- coding:iso-2022-7bit; -*-\n")
      (princ ";;   Generated by the command `titdic-convert'\n;;\tDate: ")
      (princ (current-time-string))
      (princ "\n;;\tOriginal TIT dictionary file: ")
--- 270,277 ----
        (tit-keyprompt nil))
  
      (princ ";; Quail package `")
!     (princ package)
!     (princ (format "' -*- coding:%s; -*-\n" coding-system-for-write))
      (princ ";;   Generated by the command `titdic-convert'\n;;\tDate: ")
      (princ (current-time-string))
      (princ "\n;;\tOriginal TIT dictionary file: ")
***************
*** 468,476 ****
  Optional argument DIRNAME if specified is the directory name under which
  the generated Quail package is saved."
    (interactive "FTIT dictionary file: ")
!   (let ((coding-system-for-write 'iso-2022-7bit))
      (with-temp-file  (tit-make-quail-package-file-name filename dirname)
-       (set-buffer-file-coding-system 'iso-2022-7bit)
        (let ((standard-output (current-buffer)))
        (with-temp-buffer
          (set-buffer-multibyte nil)
--- 469,476 ----
  Optional argument DIRNAME if specified is the directory name under which
  the generated Quail package is saved."
    (interactive "FTIT dictionary file: ")
!   (let ((coding-system-for-write nil))
      (with-temp-file  (tit-make-quail-package-file-name filename dirname)
        (let ((standard-output (current-buffer)))
        (with-temp-buffer
          (set-buffer-multibyte nil)
***************
*** 495,501 ****
            (setq coding-system (nth 1 slot))
            (message "Decoding with coding system %s..." coding-system)
            (goto-char (point-min))
!           (decode-coding-region (point-min) (point-max) coding-system))
  
          (set-buffer-multibyte t)
          ;; Set point the starting position of the body part.
--- 495,503 ----
            (setq coding-system (nth 1 slot))
            (message "Decoding with coding system %s..." coding-system)
            (goto-char (point-min))
!           (decode-coding-region (point-min) (point-max) coding-system)
!           (setq coding-system-for-write coding-system)
!           (remove-text-properties (point-min) (point-max) '(charset nil)))
  
          (set-buffer-multibyte t)
          ;; Set point the starting position of the body part.
***************
*** 1106,1113 ****
    (or (file-readable-p filename)
        (error "%s does not exist" filename))
    (let ((tail quail-misc-package-ext-info)
!       (default-buffer-file-coding-system 'iso-2022-7bit)
!       (coding-system-for-write 'iso-2022-7bit)
        slot
        name title dicfile coding quailfile converter copyright
        dicbuf)
--- 1108,1114 ----
    (or (file-readable-p filename)
        (error "%s does not exist" filename))
    (let ((tail quail-misc-package-ext-info)
!       coding-system-for-write
        slot
        name title dicfile coding quailfile converter copyright
        dicbuf)
***************
*** 1134,1142 ****
              converter (nth 5 slot)
              copyright (nth 6 slot))
        (message "Converting %s to %s..." dicfile quailfile)
        (with-temp-file (expand-file-name quailfile dirname)
!         (set-buffer-file-coding-system 'iso-2022-7bit)
!         (insert ";; Quail package `" name "' -*- coding:iso-2022-7bit; -*-\n")
          (insert ";;   Generated by the command `miscdic-convert'\n")
          (insert ";;   Date: " (current-time-string) "\n")
          (insert ";;   Source dictionary file: " dicfile "\n")
--- 1135,1144 ----
              converter (nth 5 slot)
              copyright (nth 6 slot))
        (message "Converting %s to %s..." dicfile quailfile)
+       (setq coding-system-for-write coding)
        (with-temp-file (expand-file-name quailfile dirname)
!         (insert (format ";; Quail package `%s' -*- coding:%s; -*-\n"
!                         name coding))
          (insert ";;   Generated by the command `miscdic-convert'\n")
          (insert ";;   Date: " (current-time-string) "\n")
          (insert ";;   Source dictionary file: " dicfile "\n")
***************
*** 1148,1154 ****
          (insert ";;; Code:\n\n")
          (insert "(require 'quail)\n")
          (insert "(quail-define-package \"" name "\" \""
!                 (if (eq coding 'big5) "Chinese-BIG5" "Chinese-CNS")
                  "\" \"" title "\" t\n")
          (let* ((coding-system-for-read coding)
                 (dicbuf (find-file-noselect filename)))
--- 1150,1158 ----
          (insert ";;; Code:\n\n")
          (insert "(require 'quail)\n")
          (insert "(quail-define-package \"" name "\" \""
!                 (if (eq coding 'big5) "Chinese-BIG5"
!                   (if (eq coding 'iso-2022-cn-ext) "Chinese-CNS"
!                     "Chinese-GB"))
                  "\" \"" title "\" t\n")
          (let* ((coding-system-for-read coding)
                 (dicbuf (find-file-noselect filename)))
***************
*** 1178,1184 ****
            command-line-args-left (cdr command-line-args-left))
        (if (file-directory-p filename)
          (dolist (file (directory-files filename t nil t))
!           (miscdic-convert file dir))
        (miscdic-convert filename dir))))
    (kill-emacs 0))
  
--- 1182,1189 ----
            command-line-args-left (cdr command-line-args-left))
        (if (file-directory-p filename)
          (dolist (file (directory-files filename t nil t))
!           (or (file-directory-p file)
!               (miscdic-convert file dir)))
        (miscdic-convert filename dir))))
    (kill-emacs 0))