Mercurial > hg > xemacs-beta
diff lisp/x-compose.el @ 5473:ac37a5f7e5be
Merge with trunk.
author | Mats Lidell <matsl@xemacs.org> |
---|---|
date | Thu, 17 Mar 2011 23:42:59 +0100 |
parents | 308d34e9f07d f00192e1cd49 |
children | 3bc58dc9d688 |
line wrap: on
line diff
--- a/lisp/x-compose.el Tue Feb 22 22:56:02 2011 +0100 +++ b/lisp/x-compose.el Thu Mar 17 23:42:59 2011 +0100 @@ -916,9 +916,9 @@ (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics? (<= (downcase base-char) ?z) (lookup-key map (make-string 1 base-char))))) - (when (and (vectorp mod-char) (= (length mod-char) 1)) + (when (and (vectorp mod-char) (eql (length mod-char) 1)) (setq mod-char (aref mod-char 0)) - (if (and (consp mod-char) (= (length mod-char) 1) + (if (and (consp mod-char) (eql (length mod-char) 1) (characterp (car mod-char))) (setq mod-char (car mod-char)))) (if (and mod-char (symbolp mod-char))