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

[Miles Bader]

Index: emacs/lisp/international/titdic-cnv.el
diff -c emacs/lisp/international/titdic-cnv.el:1.36.6.2 
emacs/lisp/international/titdic-cnv.el:1.36.6.3
*** emacs/lisp/international/titdic-cnv.el:1.36.6.2     Fri Apr 16 12:50:30 2004
--- emacs/lisp/international/titdic-cnv.el      Mon Jun 28 07:29:47 2004
***************
*** 1112,1132 ****
        name title dicfile coding quailfile converter copyright
        dicbuf)
      (while tail
!       (when (or (string-match (nth 2 (car tail)) filename)
!               ;; MS-DOS filesystem truncates file names to 8+3
!               ;; limits, so "cangjie-table.cns" becomes
!               ;; "cangjie-.cns", and the above string-match fails.
!               ;; Give DOS users a chance...
!               (and (fboundp 'msdos-long-file-names)
!                    (not (msdos-long-file-names))
!                    (string-match (dos-8+3-filename (nth 2 (car tail)))
!                                  filename)))
!       (setq slot (car tail)
!             name (car slot)
              title (nth 1 slot)
-             dicfile (nth 2 slot)
              coding (nth 3 slot)
-             quailfile (nth 4 slot)
              converter (nth 5 slot)
              copyright (nth 6 slot))
        (message "Converting %s to %s..." dicfile quailfile)
--- 1112,1136 ----
        name title dicfile coding quailfile converter copyright
        dicbuf)
      (while tail
!       (setq slot (car tail)
!           dicfile (nth 2 slot)
!           quailfile (nth 4 slot))
!       (when (and (or (string-match dicfile filename)
!                    ;; MS-DOS filesystem truncates file names to 8+3
!                    ;; limits, so "cangjie-table.cns" becomes
!                    ;; "cangjie-.cns", and the above string-match
!                    ;; fails.  Give DOS users a chance...
!                    (and (fboundp 'msdos-long-file-names)
!                         (not (msdos-long-file-names))
!                         (string-match (dos-8+3-filename dicfile) filename)))
!                (if (file-newer-than-file-p
!                     filename (expand-file-name quailfile dirname))
!                    t
!                  (message "%s is up to date" quailfile)
!                  nil))
!       (setq name (car slot)
              title (nth 1 slot)
              coding (nth 3 slot)
              converter (nth 5 slot)
              copyright (nth 6 slot))
        (message "Converting %s to %s..." dicfile quailfile)