From 47cbecb47487794902319f16204b66e04ba1ec91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Wed, 5 Jul 2023 19:42:05 +0200 Subject: [PATCH] ; fix last change * lisp/language/tibetan.el (tibetan-regexp, tibetan-precomposed-regexp) (tibetan-precomposition-rule-regexp): Don't use regexp-opt after all since it breaks bootstrapping. --- lisp/language/tibetan.el | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el index 2249fa467b1..31ff37016fe 100644 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@ -558,29 +558,31 @@ ("སྨ" . "ö†°"))) (defconst tibetan-regexp - (regexp-opt - (mapcar (lambda (x) (regexp-quote (car x))) - (append tibetan-precomposed-transcription-alist - tibetan-consonant-transcription-alist - tibetan-vowel-transcription-alist - tibetan-modifier-transcription-alist - tibetan-subjoined-transcription-alist))) + (mapconcat (lambda (x) (regexp-quote (car x))) + (append tibetan-precomposed-transcription-alist + tibetan-consonant-transcription-alist + tibetan-vowel-transcription-alist + tibetan-modifier-transcription-alist + tibetan-subjoined-transcription-alist) + "\\|") "Regexp matching a Tibetan transcription of a composable Tibetan sequence. The result of matching is to be used for indexing alists at conversion from a roman transcription to the corresponding Tibetan character.") (defvar tibetan-precomposed-regexp (purecopy - (concat "^" (regexp-opt - (mapcar #'car tibetan-precomposed-transcription-alist) - t))) + (concat "^\\(" + (mapconcat #'car tibetan-precomposed-transcription-alist "\\|") + "\\)")) "Regexp string to match a romanized Tibetan complex consonant. The result of matching is to be used for indexing alists when the input key from an input method is converted to the corresponding precomposed glyph.") (defvar tibetan-precomposition-rule-regexp (purecopy - (regexp-opt (mapcar #'car tibetan-precomposition-rule-alist) t)) + (concat "\\(" + (mapconcat #'car tibetan-precomposition-rule-alist "\\|") + "\\)")) "Regexp string to match a sequence of Tibetan consonantic components. That is, one base consonant and one or more subjoined consonants. The result of matching is to be used for indexing alist when the component -- 2.39.2