diff -ru uim-1.0.1.orig/emacs/uim-key.el uim-1.0.1/emacs/uim-key.el --- uim-1.0.1.orig/emacs/uim-key.el 2005-12-09 22:32:12.000000000 +0900 +++ uim-1.0.1/emacs/uim-key.el 2006-04-15 21:18:05.000000000 +0900 @@ -80,7 +80,9 @@ (defun uim-replace-keyvec-with-functionkeymap (keyvec) (let ((keys kyevec)) (while keys - (let ((mapto (assq (car keys) function-key-map))) + (let ((mapto (or (assq (car keys) function-key-map) + (and (boundp 'local-function-key-map) + (assq (car keys) local-function-key-map))))) (if mapto (setcar keys mapto))))) keyvec) @@ -595,7 +597,9 @@ (throw 'fkmap-loop nil) ) (setq keylist (cdr keylist))) - (setq ret (lookup-key function-key-map keyvec)) + (setq ret (or (lookup-key function-key-map keyvec) + (and (boundp 'local-function-key-map) + (lookup-key local-function-key-map keyvec)))) ) ret))