comparison src/minibuf.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 e650013c56be
children 5fdab8db3bcb
comparison
equal deleted inserted replaced
105876:c5c76c2da5ee 105877:21bdda3ded62
2072 staticpro (&minibuf_prompt); 2072 staticpro (&minibuf_prompt);
2073 2073
2074 minibuf_save_list = Qnil; 2074 minibuf_save_list = Qnil;
2075 staticpro (&minibuf_save_list); 2075 staticpro (&minibuf_save_list);
2076 2076
2077 Qcompletion_ignore_case = intern ("completion-ignore-case"); 2077 Qcompletion_ignore_case = intern_c_string ("completion-ignore-case");
2078 staticpro (&Qcompletion_ignore_case); 2078 staticpro (&Qcompletion_ignore_case);
2079 2079
2080 Qread_file_name_internal = intern ("read-file-name-internal"); 2080 Qread_file_name_internal = intern_c_string ("read-file-name-internal");
2081 staticpro (&Qread_file_name_internal); 2081 staticpro (&Qread_file_name_internal);
2082 2082
2083 Qminibuffer_default = intern ("minibuffer-default"); 2083 Qminibuffer_default = intern_c_string ("minibuffer-default");
2084 staticpro (&Qminibuffer_default); 2084 staticpro (&Qminibuffer_default);
2085 Fset (Qminibuffer_default, Qnil); 2085 Fset (Qminibuffer_default, Qnil);
2086 2086
2087 Qminibuffer_completion_table = intern ("minibuffer-completion-table"); 2087 Qminibuffer_completion_table = intern_c_string ("minibuffer-completion-table");
2088 staticpro (&Qminibuffer_completion_table); 2088 staticpro (&Qminibuffer_completion_table);
2089 2089
2090 Qminibuffer_completion_confirm = intern ("minibuffer-completion-confirm"); 2090 Qminibuffer_completion_confirm = intern_c_string ("minibuffer-completion-confirm");
2091 staticpro (&Qminibuffer_completion_confirm); 2091 staticpro (&Qminibuffer_completion_confirm);
2092 2092
2093 Qminibuffer_completion_predicate = intern ("minibuffer-completion-predicate"); 2093 Qminibuffer_completion_predicate = intern_c_string ("minibuffer-completion-predicate");
2094 staticpro (&Qminibuffer_completion_predicate); 2094 staticpro (&Qminibuffer_completion_predicate);
2095 2095
2096 staticpro (&last_minibuf_string); 2096 staticpro (&last_minibuf_string);
2097 last_minibuf_string = Qnil; 2097 last_minibuf_string = Qnil;
2098 2098
2099 Quser_variable_p = intern ("user-variable-p"); 2099 Quser_variable_p = intern_c_string ("user-variable-p");
2100 staticpro (&Quser_variable_p); 2100 staticpro (&Quser_variable_p);
2101 2101
2102 Qminibuffer_history = intern ("minibuffer-history"); 2102 Qminibuffer_history = intern_c_string ("minibuffer-history");
2103 staticpro (&Qminibuffer_history); 2103 staticpro (&Qminibuffer_history);
2104 2104
2105 Qbuffer_name_history = intern ("buffer-name-history"); 2105 Qbuffer_name_history = intern_c_string ("buffer-name-history");
2106 staticpro (&Qbuffer_name_history); 2106 staticpro (&Qbuffer_name_history);
2107 Fset (Qbuffer_name_history, Qnil); 2107 Fset (Qbuffer_name_history, Qnil);
2108 2108
2109 Qminibuffer_setup_hook = intern ("minibuffer-setup-hook"); 2109 Qminibuffer_setup_hook = intern_c_string ("minibuffer-setup-hook");
2110 staticpro (&Qminibuffer_setup_hook); 2110 staticpro (&Qminibuffer_setup_hook);
2111 2111
2112 Qminibuffer_exit_hook = intern ("minibuffer-exit-hook"); 2112 Qminibuffer_exit_hook = intern_c_string ("minibuffer-exit-hook");
2113 staticpro (&Qminibuffer_exit_hook); 2113 staticpro (&Qminibuffer_exit_hook);
2114 2114
2115 Qhistory_length = intern ("history-length"); 2115 Qhistory_length = intern_c_string ("history-length");
2116 staticpro (&Qhistory_length); 2116 staticpro (&Qhistory_length);
2117 2117
2118 Qcurrent_input_method = intern ("current-input-method"); 2118 Qcurrent_input_method = intern_c_string ("current-input-method");
2119 staticpro (&Qcurrent_input_method); 2119 staticpro (&Qcurrent_input_method);
2120 2120
2121 Qactivate_input_method = intern ("activate-input-method"); 2121 Qactivate_input_method = intern_c_string ("activate-input-method");
2122 staticpro (&Qactivate_input_method); 2122 staticpro (&Qactivate_input_method);
2123 2123
2124 Qcase_fold_search = intern ("case-fold-search"); 2124 Qcase_fold_search = intern_c_string ("case-fold-search");
2125 staticpro (&Qcase_fold_search); 2125 staticpro (&Qcase_fold_search);
2126 2126
2127 Qread_expression_history = intern ("read-expression-history"); 2127 Qread_expression_history = intern_c_string ("read-expression-history");
2128 staticpro (&Qread_expression_history); 2128 staticpro (&Qread_expression_history);
2129 2129
2130 DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function, 2130 DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function,
2131 doc: /* If this is non-nil, `read-buffer' does its work by calling this function. */); 2131 doc: /* If this is non-nil, `read-buffer' does its work by calling this function. */);
2132 Vread_buffer_function = Qnil; 2132 Vread_buffer_function = Qnil;
2255 These are in addition to the basic `field' property, and stickiness 2255 These are in addition to the basic `field' property, and stickiness
2256 properties. */); 2256 properties. */);
2257 /* We use `intern' here instead of Qread_only to avoid 2257 /* We use `intern' here instead of Qread_only to avoid
2258 initialization-order problems. */ 2258 initialization-order problems. */
2259 Vminibuffer_prompt_properties 2259 Vminibuffer_prompt_properties
2260 = Fcons (intern ("read-only"), Fcons (Qt, Qnil)); 2260 = Fcons (intern_c_string ("read-only"), Fcons (Qt, Qnil));
2261 2261
2262 DEFVAR_LISP ("read-expression-map", &Vread_expression_map, 2262 DEFVAR_LISP ("read-expression-map", &Vread_expression_map,
2263 doc: /* Minibuffer keymap used for reading Lisp expressions. */); 2263 doc: /* Minibuffer keymap used for reading Lisp expressions. */);
2264 Vread_expression_map = Qnil; 2264 Vread_expression_map = Qnil;
2265 2265