comparison src/xterm.c @ 105877:21bdda3ded62

* xterm.c (syms_of_xterm): * xselect.c (syms_of_xselect): * xmenu.c (syms_of_xmenu): * xfns.c (syms_of_xfns): * xfaces.c (syms_of_xfaces): * xdisp.c (syms_of_xdisp): * window.c (syms_of_window): * w32fns.c (syms_of_w32fns): * undo.c (syms_of_undo): * textprop.c (syms_of_textprop): * terminal.c (syms_of_terminal): * syntax.c (syms_of_syntax): * sound.c (syms_of_sound): * search.c (syms_of_search): * print.c (syms_of_print): * minibuf.c (syms_of_minibuf): * macros.c (syms_of_macros): * keymap.c (syms_of_keymap, initial_define_key) (initial_define_lispy_key): * keyboard.c (syms_of_keyboard): * insdel.c (syms_of_insdel): * image.c (syms_of_image): * fringe.c (syms_of_fringe): * frame.c (syms_of_frame): * fontset.c (syms_of_fontset): * fns.c (syms_of_fns): * fns.c (syms_of_fns): * fileio.c (syms_of_fileio): * fileio.c (syms_of_fileio): * eval.c (syms_of_eval): * doc.c (syms_of_doc): * dispnew.c (syms_of_display): * dired.c (syms_of_dired): * dbusbind.c (syms_of_dbusbind): * data.c (syms_of_data): * composite.c (syms_of_composite): * coding.c (syms_of_coding): * cmds.c (syms_of_cmds): * charset.c (define_charset_internal, syms_of_character): * ccl.c (syms_of_ccl): * category.c (syms_of_category, init_category_once): * casetab.c (syms_of_casetab): * casefiddle.c (syms_of_casefiddle): * callint.c (syms_of_callint): * bytecode.c (syms_of_bytecode): * buffer.c (keys_of_buffer, syms_of_buffer): * alloc.c (syms_of_alloc): * process.c (syms_of_process, init_process): * lread.c (syms_of_lread, init_obarray): * font.c (build_style_table): * emacs.c (syms_of_emacs, main): Replace calls to intern with intern_c_string, calls to make_pure_string with make_pure_c_string. Use pure_cons instead of Fcons. * process.c (socket_options): Make it const. (set_socket_option, init_process): Use a const pointer. * lread.c (intern_c_string): New function. (defvar_kboard, defvar_lisp, defvar_lisp_nopro, defvar_bool) (defvar_int): Uset it. Make the name const char*. * font.c (struct table_entry): Remove unused member. Make NAMES constant. (weight_table, slant_table, width_table): Make constant. * emacs.c (struct standard_args): Make name and longname constant.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 06 Nov 2009 06:50:52 +0000
parents 56d1856a3ea9
children 5910e0380daf
comparison
equal deleted inserted replaced
105876:c5c76c2da5ee 105877:21bdda3ded62
10828 10828
10829 staticpro (&last_mouse_scroll_bar); 10829 staticpro (&last_mouse_scroll_bar);
10830 last_mouse_scroll_bar = Qnil; 10830 last_mouse_scroll_bar = Qnil;
10831 10831
10832 staticpro (&Qvendor_specific_keysyms); 10832 staticpro (&Qvendor_specific_keysyms);
10833 Qvendor_specific_keysyms = intern ("vendor-specific-keysyms"); 10833 Qvendor_specific_keysyms = intern_c_string ("vendor-specific-keysyms");
10834 10834
10835 staticpro (&Qlatin_1); 10835 staticpro (&Qlatin_1);
10836 Qlatin_1 = intern ("latin-1"); 10836 Qlatin_1 = intern_c_string ("latin-1");
10837 10837
10838 staticpro (&last_mouse_press_frame); 10838 staticpro (&last_mouse_press_frame);
10839 last_mouse_press_frame = Qnil; 10839 last_mouse_press_frame = Qnil;
10840 10840
10841 #ifdef USE_GTK 10841 #ifdef USE_GTK
10842 xg_default_icon_file = build_string ("icons/hicolor/scalable/apps/emacs.svg"); 10842 xg_default_icon_file = build_string ("icons/hicolor/scalable/apps/emacs.svg");
10843 staticpro (&xg_default_icon_file); 10843 staticpro (&xg_default_icon_file);
10844 10844
10845 Qx_gtk_map_stock = intern ("x-gtk-map-stock"); 10845 Qx_gtk_map_stock = intern_c_string ("x-gtk-map-stock");
10846 staticpro (&Qx_gtk_map_stock); 10846 staticpro (&Qx_gtk_map_stock);
10847 #endif 10847 #endif
10848 10848
10849 DEFVAR_BOOL ("x-use-underline-position-properties", 10849 DEFVAR_BOOL ("x-use-underline-position-properties",
10850 &x_use_underline_position_properties, 10850 &x_use_underline_position_properties,
10878 doc: /* What X toolkit scroll bars Emacs uses. 10878 doc: /* What X toolkit scroll bars Emacs uses.
10879 A value of nil means Emacs doesn't use X toolkit scroll bars. 10879 A value of nil means Emacs doesn't use X toolkit scroll bars.
10880 Otherwise, value is a symbol describing the X toolkit. */); 10880 Otherwise, value is a symbol describing the X toolkit. */);
10881 #ifdef USE_TOOLKIT_SCROLL_BARS 10881 #ifdef USE_TOOLKIT_SCROLL_BARS
10882 #ifdef USE_MOTIF 10882 #ifdef USE_MOTIF
10883 Vx_toolkit_scroll_bars = intern ("motif"); 10883 Vx_toolkit_scroll_bars = intern_c_string ("motif");
10884 #elif defined HAVE_XAW3D 10884 #elif defined HAVE_XAW3D
10885 Vx_toolkit_scroll_bars = intern ("xaw3d"); 10885 Vx_toolkit_scroll_bars = intern_c_string ("xaw3d");
10886 #elif USE_GTK 10886 #elif USE_GTK
10887 Vx_toolkit_scroll_bars = intern ("gtk"); 10887 Vx_toolkit_scroll_bars = intern_c_string ("gtk");
10888 #else 10888 #else
10889 Vx_toolkit_scroll_bars = intern ("xaw"); 10889 Vx_toolkit_scroll_bars = intern_c_string ("xaw");
10890 #endif 10890 #endif
10891 #else 10891 #else
10892 Vx_toolkit_scroll_bars = Qnil; 10892 Vx_toolkit_scroll_bars = Qnil;
10893 #endif 10893 #endif
10894 10894
10895 staticpro (&last_mouse_motion_frame); 10895 staticpro (&last_mouse_motion_frame);
10896 last_mouse_motion_frame = Qnil; 10896 last_mouse_motion_frame = Qnil;
10897 10897
10898 Qmodifier_value = intern ("modifier-value"); 10898 Qmodifier_value = intern_c_string ("modifier-value");
10899 Qalt = intern ("alt"); 10899 Qalt = intern_c_string ("alt");
10900 Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); 10900 Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
10901 Qhyper = intern ("hyper"); 10901 Qhyper = intern_c_string ("hyper");
10902 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); 10902 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
10903 Qmeta = intern ("meta"); 10903 Qmeta = intern_c_string ("meta");
10904 Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); 10904 Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
10905 Qsuper = intern ("super"); 10905 Qsuper = intern_c_string ("super");
10906 Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); 10906 Fput (Qsuper, Qmodifier_value, make_number (super_modifier));
10907 10907
10908 DEFVAR_LISP ("x-alt-keysym", &Vx_alt_keysym, 10908 DEFVAR_LISP ("x-alt-keysym", &Vx_alt_keysym,
10909 doc: /* Which keys Emacs uses for the alt modifier. 10909 doc: /* Which keys Emacs uses for the alt modifier.
10910 This should be one of the symbols `alt', `hyper', `meta', `super'. 10910 This should be one of the symbols `alt', `hyper', `meta', `super'.