aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2006-09-03 14:01:01 +0000
committerJuri Linkov2006-09-03 14:01:01 +0000
commit35f111baba762a476b303076a848a335d1ac2f85 (patch)
treea6c4550a3c5bf977eca98ab0ba94036f82d057fb
parent6a8c7cfe2059bc6e566675679d9dbbcdfd07bdb0 (diff)
downloademacs-35f111baba762a476b303076a848a335d1ac2f85.tar.gz
emacs-35f111baba762a476b303076a848a335d1ac2f85.zip
(quail-defrule-internal): Add a check if a key is a vector.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/quail.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 639ddae4118..cd606e8f4da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-09-03 Juri Linkov <juri@jurta.org>
2
3 * international/quail.el (quail-defrule-internal): Add a check
4 if a key is a vector.
5
12006-09-02 Juri Linkov <juri@jurta.org> 62006-09-02 Juri Linkov <juri@jurta.org>
2 7
3 * man.el (Man-topic-history): New variable. 8 * man.el (Man-topic-history): New variable.
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index b21d2623d80..fceebf64f22 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1095,7 +1095,7 @@ Optional 5th arg DECODE-MAP is a Quail decode map.
1095 1095
1096Optional 6th arg PROPS is a property list annotating TRANS. See the 1096Optional 6th arg PROPS is a property list annotating TRANS. See the
1097function `quail-define-rules' for the detail." 1097function `quail-define-rules' for the detail."
1098 (if (null (stringp key)) 1098 (if (not (or (stringp key) (vectorp key)))
1099 (error "Invalid Quail key `%s'" key)) 1099 (error "Invalid Quail key `%s'" key))
1100 (if (not (or (numberp trans) (stringp trans) (vectorp trans) 1100 (if (not (or (numberp trans) (stringp trans) (vectorp trans)
1101 (consp trans) 1101 (consp trans)