Mercurial > hg > xemacs-beta
comparison lisp/descr-text.el @ 5473:ac37a5f7e5be
Merge with trunk.
author | Mats Lidell <matsl@xemacs.org> |
---|---|
date | Thu, 17 Mar 2011 23:42:59 +0100 |
parents | 0af042a0c116 ed74d2ca7082 |
children | 248176c74e6b |
comparison
equal
deleted
inserted
replaced
5472:e79980ee5efe | 5473:ac37a5f7e5be |
---|---|
763 (buffer-substring | 763 (buffer-substring |
764 (line-beginning-position) | 764 (line-beginning-position) |
765 (line-end-position)) ";") | 765 (line-end-position)) ";") |
766 :test 'equal)))) | 766 :test 'equal)))) |
767 ;; The length depends on whether the last field was empty. | 767 ;; The length depends on whether the last field was empty. |
768 (unless (or (= 13 (length fields)) | 768 (unless (or (eql 13 (length fields)) |
769 (= 14 (length fields))) | 769 (eql 14 (length fields))) |
770 (error 'invalid-argument | 770 (error 'invalid-argument |
771 (format "Invalid contents in %s" | 771 (format "Invalid contents in %s" |
772 describe-char-unicodedata-file))) | 772 describe-char-unicodedata-file))) |
773 ;; The field names and values lists are slightly | 773 ;; The field names and values lists are slightly |
774 ;; modified from Mule-UCS unidata.el. | 774 ;; modified from Mule-UCS unidata.el. |
1116 ; (while props | 1116 ; (while props |
1117 ; (push (format "%s:" (pop props)) ps) | 1117 ; (push (format "%s:" (pop props)) ps) |
1118 ; (push (format "%s;" (pop props)) ps)) | 1118 ; (push (format "%s;" (pop props)) ps)) |
1119 ; (list (cons "Properties" (nreverse ps))))) | 1119 ; (list (cons "Properties" (nreverse ps))))) |
1120 ("to input" | 1120 ("to input" |
1121 ,@(let ((key-list (and-fboundp #'quail-find-key | 1121 ,@(let ((key-list (and-fboundp 'quail-find-key |
1122 current-input-method | 1122 current-input-method |
1123 (quail-find-key char)))) | 1123 (quail-find-key char)))) |
1124 (if (consp key-list) | 1124 (if (consp key-list) |
1125 (list "type" | 1125 (list "type" |
1126 (mapconcat #'(lambda (x) (concat "\"" x "\"")) | 1126 (mapconcat #'(lambda (x) (concat "\"" x "\"")) |