diff options
| author | Stefan Monnier | 2003-05-18 20:58:34 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2003-05-18 20:58:34 +0000 |
| commit | 462a7ed6142961baf770eac8141bbe43192cbd45 (patch) | |
| tree | 0763ba696c5a5f716f949667fb8c0ff99384ba72 | |
| parent | 9c0fb8b969c0e497469a1a26c1d74cb3c227d979 (diff) | |
| download | emacs-462a7ed6142961baf770eac8141bbe43192cbd45.tar.gz emacs-462a7ed6142961baf770eac8141bbe43192cbd45.zip | |
(indian-regexp-of-hashtbl-keys): Don't sort the argument to regexp-opt.
(indian--puthash-char): Use dolist rather than mapc.
| -rw-r--r-- | lisp/language/ind-util.el | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el index 8885960dff8..60008cce48c 100644 --- a/lisp/language/ind-util.el +++ b/lisp/language/ind-util.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: iso-2022-7bit; -*- | 1 | ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: iso-2022-7bit; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> | 5 | ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> |
| 6 | ;; Keywords: multilingual, Indian, Devanagari | 6 | ;; Keywords: multilingual, Indian, Devanagari |
| @@ -42,14 +42,9 @@ | |||
| 42 | 42 | ||
| 43 | (defun indian-regexp-of-hashtbl-keys (hashtbl) | 43 | (defun indian-regexp-of-hashtbl-keys (hashtbl) |
| 44 | "Returns the regular expression of hashtable keys." | 44 | "Returns the regular expression of hashtable keys." |
| 45 | (let ((max-specpdl-size 1000)) | 45 | (let (keys) |
| 46 | (regexp-opt | 46 | (maphash (lambda (key val) (push key keys)) hashtbl) |
| 47 | (sort | 47 | (regexp-opt keys))) |
| 48 | (let (dummy) | ||
| 49 | (maphash (function (lambda (key val) (setq dummy (cons key dummy)))) | ||
| 50 | hashtbl) | ||
| 51 | dummy) | ||
| 52 | (function (lambda (x y) (> (length x) (length y)))))))) | ||
| 53 | 48 | ||
| 54 | (defvar indian-dev-base-table | 49 | (defvar indian-dev-base-table |
| 55 | '( | 50 | '( |
| @@ -414,10 +409,8 @@ FUNCTION will be called 15 times." | |||
| 414 | (if (stringp trans-char) (setq trans-char (list trans-char))) | 409 | (if (stringp trans-char) (setq trans-char (list trans-char))) |
| 415 | (if (char-valid-p char) (setq char (char-to-string char))) | 410 | (if (char-valid-p char) (setq char (char-to-string char))) |
| 416 | (puthash char (car trans-char) encode-hash) | 411 | (puthash char (car trans-char) encode-hash) |
| 417 | (mapc | 412 | (dolist (trans trans-char) |
| 418 | (lambda (trans) | 413 | (puthash trans char decode-hash))))) |
| 419 | (puthash trans char decode-hash)) | ||
| 420 | trans-char)))) | ||
| 421 | 414 | ||
| 422 | (defun indian--map (f l1 l2) | 415 | (defun indian--map (f l1 l2) |
| 423 | (while l1 | 416 | (while l1 |