Mercurial > hg > xemacs-beta

comparison lisp/x-compose.el @ 5473:ac37a5f7e5be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Thu, 17 Mar 2011 23:42:59 +0100
parents 308d34e9f07d f00192e1cd49
children 3bc58dc9d688
comparison
equal deleted inserted replaced
5472:e79980ee5efe 5473:ac37a5f7e5be
914 (t (error "unknown diacritic: %s (%c)" c c)))) 914 (t (error "unknown diacritic: %s (%c)" c c))))
915 (base-char (preceding-char)) 915 (base-char (preceding-char))
916 (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics? 916 (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics?
917 (<= (downcase base-char) ?z) 917 (<= (downcase base-char) ?z)
918 (lookup-key map (make-string 1 base-char))))) 918 (lookup-key map (make-string 1 base-char)))))
919 (when (and (vectorp mod-char) (= (length mod-char) 1)) 919 (when (and (vectorp mod-char) (eql (length mod-char) 1))
920 (setq mod-char (aref mod-char 0)) 920 (setq mod-char (aref mod-char 0))
921 (if (and (consp mod-char) (= (length mod-char) 1) 921 (if (and (consp mod-char) (eql (length mod-char) 1)
922 (characterp (car mod-char))) 922 (characterp (car mod-char)))
923 (setq mod-char (car mod-char)))) 923 (setq mod-char (car mod-char))))
924 (if (and mod-char (symbolp mod-char)) 924 (if (and mod-char (symbolp mod-char))
925 (setq mod-char (or (get-character-of-keysym mod-char) mod-char))) 925 (setq mod-char (or (get-character-of-keysym mod-char) mod-char)))
926 (if (and mod-char (> count 0)) 926 (if (and mod-char (> count 0))