Mercurial > hg > xemacs-beta
diff man/lispref/os.texi @ 5529:3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
src/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* console.c:
* console.c (allocate_console):
* console.c (vars_of_console):
* console.c (complex_vars_of_console):
* lisp.h:
Add a new keymap variable, function-key-map-parent; use it as the
parent of each console-specific function-key-map. This is
appropriate for things like x-compose processing.
lisp/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* gtk-init.el:
* gtk-init.el (make-device-late-gtk-entry-point):
* gtk-init.el (gtk-initialize-compose): Removed.
* keymap.el:
* keymap.el (function-key-map-parent):
* x-init.el (x-initialize-compose): Removed.
* x-init.el (make-device-late-x-entry-point):
Make the bindings for dead-acute and friends in
function-key-map-parent, rather than function-key-map; do this in
keymap.el rather than in window-system-specific code, since the
compose processing is generally useful and not X11-specific.
It's probably reasonable to rename x-compose.el to compose.el at
this point, but I haven't done that.
man/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* lispref/os.texi (Translating Input):
Document the just-added function-key-map-parent.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 25 Jun 2011 14:00:48 +0100 |
parents | 1537701f08a1 |
children | 9fae6227ede5 |
line wrap: on
line diff
--- a/man/lispref/os.texi Fri Jun 24 19:59:35 2011 +0100 +++ b/man/lispref/os.texi Sat Jun 25 14:00:48 2011 +0100 @@ -1301,10 +1301,10 @@ @end ignore @defvar function-key-map -This variable holds a keymap that describes the character sequences -sent by function keys on an ordinary character terminal. This keymap -uses the same data structure as other keymaps, but is used differently: it -specifies translations to make while reading events. +This console-local variable holds a keymap that describes the character +sequences sent by function keys on an ordinary character terminal. This +keymap uses the same data structure as other keymaps, but is used +differently: it specifies translations to make while reading events. If @code{function-key-map} ``binds'' a key sequence @var{k} to a vector @var{v}, then when @var{k} appears as a subsequence @emph{anywhere} in a @@ -1337,6 +1337,14 @@ the character sequences that represent function keys. @end defvar +@defvar function-key-map-parent +The parent keymap of @code{function-key-map} is a non-console-local keymap, +@code{function-key-map-parent}, and any additions to +@code{function-key-map} that are not specific to a given console should +normally go into @code{function-key-map-parent} rather than +@code{function-key-map}. +@end defvar + @defvar key-translation-map This variable is another keymap used just like @code{function-key-map} to translate input events into other events. It differs from