comparison src/keyboard.c @ 83346:7372c2f9daac

Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map. * src/keyboard.h (struct kboard): Rename member 'Vfunction_key_map' to 'Vlocal_function_key_map', and 'Vkey_translation_map' to 'Vlocal_key_translation_map'. (Vfunction_key_map, Vkey_translation_map): New declarations. * src/keyboard.c (Vfunction_key_map): New variable. (Vglobal_key_translation_map): Rename to Vglobal_key_translation_map. (read_key_sequence, init_kboard, syms_of_keyboard, mark_kboards): Update. * src/keymap.c (Fdescribe_buffer_bindings): Update. * src/term.c (term_get_fkeys_1): Update. * lisp/double.el (double-setup): Replace global-key-translation-map with key-translation-map. * lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto. * lisp/international/iso-transl.el: Ditto. * lisp/obsolete/iso-acc.el (iso-accents-customize): Ditto. * lisp/edmacro.el (edmacro-format-keys): Use terminal-local binding of local-function-key-map instead of function-key-map. * lisp/emulation/cua-base.el (cua--pre-command-handler): Ditto. * lisp/isearch.el (isearch-other-meta-char): Ditto. * lisp/subr.el (read-quoted-char): Ditto. * lisp/term/vt200.el: Ditto. * lisp/term/vt201.el: Ditto. * lisp/term/vt220.el: Ditto. * lisp/term/vt240.el: Ditto. * lisp/term/vt300.el: Ditto. * lisp/term/vt320.el: Ditto. * lisp/term/vt400.el: Ditto. * lisp/term/vt420.el: Ditto. * lisp/simple.el (normal-erase-is-backspace-mode): Add todo note. * lisp/xt-mouse.el: Ditto. * lisp/term/AT386.el: Adapt for renaming of function-key-map to local-function-key-map. * lisp/term/internal.el: Ditto. * lisp/term/iris-ansi.el: Ditto. * lisp/term/lk201.el: Ditto. * lisp/term/mac-win.el: Ditto. * lisp/term/news.el: Ditto. * lisp/term/rxvt.el: Ditto. * lisp/term/sun.el: Ditto. * lisp/term/tvi970.el: Ditto. * lisp/term/wyse50.el: Ditto. * lisp/term/x-win.el (x-setup-function-keys): Ditto. * lisp/term/xterm.el: Ditto. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-386

83345:817977e20b0d

/* Hooks to run before and after each command.  */
Lisp_Object Qpre_command_hook, Vpre_command_hook;
Lisp_Object Qpost_command_hook, Vpost_command_hook;
Lisp_Object Qcommand_hook_internal, Vcommand_hook_internal;

/* Parent keymap of terminal-local key-translation-map instances.  */
Lisp_Object Vglobal_key_translation_map;

/* List of deferred actions to be performed at a later time.
   The precise format isn't relevant here; we just check whether it is nil.  */
Lisp_Object Vdeferred_action_list;

  raw_keybuf_count = 0;

  last_nonmenu_event = Qnil;

  delayed_switch_frame = Qnil;
  fkey.map = fkey.parent = current_kboard->Vfunction_key_map;
  keytran.map = keytran.parent = current_kboard->Vkey_translation_map;
  /* If there is no translation-map, turn off scanning.  */
  fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1;
  keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1;

  if (INTERACTIVE)

  kb->defining_kbd_macro = Qnil;
  kb->Vlast_kbd_macro = Qnil;
  kb->reference_count = 0;
  kb->Vsystem_key_alist = Qnil;
  kb->system_key_syms = Qnil;
  kb->Vfunction_key_map = Fmake_sparse_keymap (Qnil);
  kb->Vkey_translation_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (kb->Vkey_translation_map, Vglobal_key_translation_map);
  kb->Vdefault_minibuffer_frame = Qnil;
}

/*
 * Destroy the contents of a kboard object, but not the object itself.

Note that the currently selected frame has very little to do with
which binding of this variable is active at any given moment.  If you
need set or get the binding on a specific display, use
`terminal-local-value' and `set-terminal-local-value'.  */);

  DEFVAR_KBOARD ("function-key-map", Vfunction_key_map,
                 doc: /* Keymap mapping ASCII function key sequences onto their preferred forms.
This allows Emacs to recognize function keys sent from ASCII
terminals at any point in a key sequence.

The `read-key-sequence' function replaces any subsequence bound by

Typing `ESC O P' to `read-key-sequence' would return [f1].  Typing
`C-x ESC O P' would return [?\\C-x f1].  If [f1] were a prefix
key, typing `ESC O P x' would return [f1 x].

`function-key-map' has a separate binding for each display device.
See Info node `(elisp)Multiple displays'.

Note that the currently selected frame has very little to do with
which binding of this variable is active at any given moment.  If you
need set or get the binding on a specific display, use
`terminal-local-value' and `set-terminal-local-value'.  */);

  DEFVAR_KBOARD ("key-translation-map", Vkey_translation_map,
	       doc: /* Keymap of key translations that can override keymaps.
This keymap works like `function-key-map', but comes after that,
and its non-prefix bindings override ordinary bindings.

`key-translation-map' has a separate binding for each display device.

Note that the currently selected frame has very little to do with
which binding of this variable is active at any given moment.  If you
need set or get the binding on a specific display, use
`terminal-local-value' and `set-terminal-local-value'.  */);

  DEFVAR_LISP ("global-key-translation-map", &Vglobal_key_translation_map,
               doc: /* The parent keymap of all terminal-local `key-translation-map' instances.
Key translations that are not specific to a display device flavour
should go here.  */);
  Vglobal_key_translation_map = Fmake_sparse_keymap (Qnil);

  DEFVAR_LISP ("deferred-action-list", &Vdeferred_action_list,
	       doc: /* List of deferred actions to be performed at a later time.
The precise format isn't relevant here; we just check whether it is nil.  */);
  Vdeferred_action_list = Qnil;

      mark_object (kb->kbd_queue);
      mark_object (kb->defining_kbd_macro);
      mark_object (kb->Vlast_kbd_macro);
      mark_object (kb->Vsystem_key_alist);
      mark_object (kb->system_key_syms);
      mark_object (kb->Vfunction_key_map);
      mark_object (kb->Vkey_translation_map);
      mark_object (kb->Vdefault_minibuffer_frame);
      mark_object (kb->echo_string);
    }
  {
    struct input_event *event;

83346:7372c2f9daac

/* Hooks to run before and after each command.  */
Lisp_Object Qpre_command_hook, Vpre_command_hook;
Lisp_Object Qpost_command_hook, Vpost_command_hook;
Lisp_Object Qcommand_hook_internal, Vcommand_hook_internal;

/* Parent keymap of terminal-local function-key-map instances.  */
Lisp_Object Vfunction_key_map;

/* Parent keymap of terminal-local key-translation-map instances.  */
Lisp_Object Vkey_translation_map;

/* List of deferred actions to be performed at a later time.
   The precise format isn't relevant here; we just check whether it is nil.  */
Lisp_Object Vdeferred_action_list;

  raw_keybuf_count = 0;

  last_nonmenu_event = Qnil;

  delayed_switch_frame = Qnil;
  fkey.map = fkey.parent = current_kboard->Vlocal_function_key_map;
  keytran.map = keytran.parent = current_kboard->Vlocal_key_translation_map;
  /* If there is no translation-map, turn off scanning.  */
  fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1;
  keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1;

  if (INTERACTIVE)

  kb->defining_kbd_macro = Qnil;
  kb->Vlast_kbd_macro = Qnil;
  kb->reference_count = 0;
  kb->Vsystem_key_alist = Qnil;
  kb->system_key_syms = Qnil;
  kb->Vlocal_function_key_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (kb->Vlocal_function_key_map, Vfunction_key_map);
  kb->Vlocal_key_translation_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (kb->Vlocal_key_translation_map, Vkey_translation_map);
  kb->Vdefault_minibuffer_frame = Qnil;
}

/*
 * Destroy the contents of a kboard object, but not the object itself.

Note that the currently selected frame has very little to do with
which binding of this variable is active at any given moment.  If you
need set or get the binding on a specific display, use
`terminal-local-value' and `set-terminal-local-value'.  */);

  DEFVAR_KBOARD ("local-function-key-map", Vlocal_function_key_map,
                 doc: /* Keymap mapping ASCII function key sequences onto their preferred forms.
This allows Emacs to recognize function keys sent from ASCII
terminals at any point in a key sequence.

The `read-key-sequence' function replaces any subsequence bound by

Typing `ESC O P' to `read-key-sequence' would return [f1].  Typing
`C-x ESC O P' would return [?\\C-x f1].  If [f1] were a prefix
key, typing `ESC O P x' would return [f1 x].

`function-key-map' has a separate binding for each display device.
See Info node `(elisp)Multiple displays'.  If you need to define a
binding on all display devices, change `global-function-key-map'
instead.

Note that the currently selected frame has very little to do with
which binding of this variable is active at any given moment.  If you
need set or get the binding on a specific display, use
`terminal-local-value' and `set-terminal-local-value'.  */);

  DEFVAR_LISP ("function-key-map", &Vfunction_key_map,
               doc: /* The parent keymap of all `local-function-key-map' instances.
Function key definitions that apply to all display devices should go
here.  */);
  Vfunction_key_map = Fmake_sparse_keymap (Qnil);
                    
  DEFVAR_KBOARD ("local-key-translation-map", Vlocal_key_translation_map,
	       doc: /* Keymap of key translations that can override keymaps.
This keymap works like `function-key-map', but comes after that,
and its non-prefix bindings override ordinary bindings.

`key-translation-map' has a separate binding for each display device.

Note that the currently selected frame has very little to do with
which binding of this variable is active at any given moment.  If you
need set or get the binding on a specific display, use
`terminal-local-value' and `set-terminal-local-value'.  */);

  DEFVAR_LISP ("key-translation-map", &Vkey_translation_map,
               doc: /* The parent keymap of all `local-key-translation-map' instances.
Key translations that apply to all display devices should go here.  */);
  Vkey_translation_map = Fmake_sparse_keymap (Qnil);

  DEFVAR_LISP ("deferred-action-list", &Vdeferred_action_list,
	       doc: /* List of deferred actions to be performed at a later time.
The precise format isn't relevant here; we just check whether it is nil.  */);
  Vdeferred_action_list = Qnil;

      mark_object (kb->kbd_queue);
      mark_object (kb->defining_kbd_macro);
      mark_object (kb->Vlast_kbd_macro);
      mark_object (kb->Vsystem_key_alist);
      mark_object (kb->system_key_syms);
      mark_object (kb->Vlocal_function_key_map);
      mark_object (kb->Vlocal_key_translation_map);
      mark_object (kb->Vdefault_minibuffer_frame);
      mark_object (kb->echo_string);
    }
  {
    struct input_event *event;