comparison lisp/x-win-xfree86.el @ 4482:e3ef34f57070

Bind function-key-map correctly in device-specific startup code. 2008-07-26 Aidan Kehoe <kehoea@parhasard.net> * x-init.el (x-initialize-compose): Rewrite to use #'loop, as does similar code in x-win-sun.el, x-win-xfree86.el. Locally bind function-key-map to the correct value for the device's console. * x-win-xfree86.el (x-win-init-xfree86): Locally bind function-key-map to the correct value for the device's console. * x-win-sun.el (x-win-init-sun): Locally bind function-key-map to the correct value for the device's console.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 26 Jul 2008 09:37:08 +0200
parents e34711681f30
children 17fe69fff7fa
comparison
equal deleted inserted replaced
4481:f9c70d94f427 4482:e3ef34f57070
88 (f20 f8) 88 (f20 f8)
89 (f21 f9) 89 (f21 f9)
90 (f22 f10) 90 (f22 f10)
91 (f23 f11) 91 (f23 f11)
92 (f24 f12)) 92 (f24 f12))
93 ;; Get the correct value for function-key-map
94 with function-key-map = (symbol-value-in-console 'function-key-map
95 (device-console device)
96 function-key-map)
97
93 do 98 do
94 (when (and (x-keysym-on-keyboard-p key device) 99 (when (and (x-keysym-on-keyboard-p key device)
95 (not (x-keysym-on-keyboard-sans-modifiers-p key device))) 100 (not (x-keysym-on-keyboard-sans-modifiers-p key device)))
96 ;; define also the control, meta, and meta-control versions. 101 ;; define also the control, meta, and meta-control versions.
97 (loop for mods in '(() (control) (meta) (meta control)) do 102 (loop for mods in '(() (control) (meta) (meta control)) do