# HG changeset patch # User Dave Love # Date 1022178228 0 # Node ID 04b31cd7acc580e6761e936b0721ac99ab563447 # Parent 3157a3f9d92d2e2cc52bc1f30887595520c8a08c Avoid decode-char. (indian--puthash-char, indian--puthash-c, indian--puthash-cv): Use characterp, not char-valid-p. diff -r 3157a3f9d92d -r 04b31cd7acc5 lisp/language/ind-util.el --- a/lisp/language/ind-util.el Thu May 23 18:20:50 2002 +0000 +++ b/lisp/language/ind-util.el Thu May 23 18:23:48 2002 +0000 @@ -213,7 +213,7 @@ ;; trans-char -- nil / string / list of strings (when (and char trans-char) (if (stringp trans-char) (setq trans-char (list trans-char))) - (if (char-valid-p char) (setq char (char-to-string char))) + (if (characterp char) (setq char (char-to-string char))) (puthash char (car trans-char) encode-hash) (mapc (lambda (trans) @@ -233,7 +233,7 @@ (defun indian--puthash-c (c trans-c halant hashtbls) (indian--map (lambda (c trans-c) - (if (char-valid-p c) (setq c (char-to-string c))) + (if (characterp c) (setq c (char-to-string c))) (indian--puthash-char (concat c halant) trans-c hashtbls)) c trans-c)) @@ -249,8 +249,8 @@ (indian--map (lambda (v trans-v) (when (and c trans-c v trans-v) - (if (char-valid-p c) (setq c (char-to-string c))) - (setq v (if (char-valid-p (cadr v)) (char-to-string (cadr v)) "")) + (if (characterp c) (setq c (char-to-string c))) + (setq v (if (characterp (cadr v)) (char-to-string (cadr v)) "")) (if (stringp trans-c) (setq trans-c (list trans-c))) (if (stringp trans-v) (setq trans-v (list trans-v))) (indian--puthash-char @@ -534,11 +534,9 @@ (set hashtable (make-hash-table :test 'equal :size 128)) (mapc (function (lambda (x) - (put-char-code-property (decode-char 'ucs (car x)) - 'script script) - (put-char-code-property (decode-char 'ucs (car x)) - 'iscii (cdr x)) - (puthash (cdr x) (char-to-string (decode-char 'ucs (car x))) + (put-char-code-property (car x) 'script script) + (put-char-code-property (car x) 'iscii (cdr x)) + (puthash (cdr x) (char-to-string (car x)) (eval hashtable)))) (eval (intern (concat "ucs-" (symbol-name script) "-to-is13194-alist")))) @@ -548,8 +546,8 @@ (defvar ucs-to-is13194-regexp ;; only Devanagari is supported now. - (concat "[" (char-to-string (decode-char 'ucs #x0900)) - "-" (char-to-string (decode-char 'ucs #x097f)) "]") + (concat "[" (char-to-string #x0900) + "-" (char-to-string #x097f) "]") "Regexp that matches to conversion") (defun ucs-to-iscii-region (from to)