Mercurial > emacs
comparison lisp/international/quail.el @ 90599:c358d0861b16
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 414-422)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 128-130)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 05 Sep 2006 02:54:22 +0000 |
parents | 7beb78bc1f8e ab32c6acd9f2 |
children | 38ad9fa1876b |
comparison
equal
deleted
inserted
replaced
90598:4a8681a3d827 | 90599:c358d0861b16 |
---|---|
1093 | 1093 |
1094 Optional 5th arg DECODE-MAP is a Quail decode map. | 1094 Optional 5th arg DECODE-MAP is a Quail decode map. |
1095 | 1095 |
1096 Optional 6th arg PROPS is a property list annotating TRANS. See the | 1096 Optional 6th arg PROPS is a property list annotating TRANS. See the |
1097 function `quail-define-rules' for the detail." | 1097 function `quail-define-rules' for the detail." |
1098 (if (null (stringp key)) | 1098 (if (not (or (stringp key) (vectorp key))) |
1099 "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) |
1102 (symbolp trans) | 1102 (symbolp trans) |
1103 (quail-map-p trans))) | 1103 (quail-map-p trans))) |
1104 (error "Invalid Quail translation `%s'" trans)) | 1104 (error "Invalid Quail translation `%s'" trans)) |