Mercurial > emacs
changeset 11807:73fb6570f718
(Qvendor_specific_keysyms): New var.
(syms_of_xterm): Initialize and staticpro it.
(x_term_init): Initialize Vsystem_key_alist according to vendor.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Sat, 13 May 1995 00:13:02 +0000 |
| parents | 78258a1b902b |
| children | 341f7ec50c24 |
| files | src/xterm.c |
| diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Fri May 12 22:23:42 1995 +0000 +++ b/src/xterm.c Sat May 13 00:13:02 1995 +0000 @@ -211,6 +211,8 @@ /* A mask of extra modifier bits to put into every keyboard char. */ extern int extra_keyboard_modifiers; +static Lisp_Object Qvendor_specific_keysyms; + extern XrmDatabase x_load_resources (); void x_delete_display (); @@ -5624,9 +5626,14 @@ { dpyinfo->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); init_kboard (dpyinfo->kboard); - /* Change this after lisp/term/x-win.el is prepared to initialize - this var in a server-dependent manner. */ - dpyinfo->kboard->Vsystem_key_alist = initial_kboard->Vsystem_key_alist; + if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) + { + char *vendor = ServerVendor (dpy); + dpyinfo->kboard->Vsystem_key_alist + = call1 (Qvendor_specific_keysyms, + build_string (vendor ? vendor : "")); + } + dpyinfo->kboard->next_kboard = all_kboards; all_kboards = dpyinfo->kboard; /* Don't let the initial kboard remain current longer than necessary. @@ -5896,5 +5903,8 @@ staticpro (&last_mouse_scroll_bar); last_mouse_scroll_bar = Qnil; + + staticpro (&Qvendor_specific_keysyms); + Qvendor_specific_keysyms = intern ("vendor-specific-keysyms"); } #endif /* ! defined (HAVE_X_WINDOWS) */