comparison src/buffer.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 68dd71358159
children 8103235103a7
comparison
equal deleted inserted replaced
105876:c5c76c2da5ee 105877:21bdda3ded62
5160 5160
5161 /* Set up the default values of various buffer slots. */ 5161 /* Set up the default values of various buffer slots. */
5162 /* Must do these before making the first buffer! */ 5162 /* Must do these before making the first buffer! */
5163 5163
5164 /* real setup is done in bindings.el */ 5164 /* real setup is done in bindings.el */
5165 buffer_defaults.mode_line_format = build_string ("%-"); 5165 buffer_defaults.mode_line_format = make_pure_c_string ("%-");
5166 buffer_defaults.header_line_format = Qnil; 5166 buffer_defaults.header_line_format = Qnil;
5167 buffer_defaults.abbrev_mode = Qnil; 5167 buffer_defaults.abbrev_mode = Qnil;
5168 buffer_defaults.overwrite_mode = Qnil; 5168 buffer_defaults.overwrite_mode = Qnil;
5169 buffer_defaults.case_fold_search = Qt; 5169 buffer_defaults.case_fold_search = Qt;
5170 buffer_defaults.auto_fill_function = Qnil; 5170 buffer_defaults.auto_fill_function = Qnil;
5302 current_buffer = 0; 5302 current_buffer = 0;
5303 all_buffers = 0; 5303 all_buffers = 0;
5304 5304
5305 QSFundamental = build_string ("Fundamental"); 5305 QSFundamental = build_string ("Fundamental");
5306 5306
5307 Qfundamental_mode = intern ("fundamental-mode"); 5307 Qfundamental_mode = intern_c_string ("fundamental-mode");
5308 buffer_defaults.major_mode = Qfundamental_mode; 5308 buffer_defaults.major_mode = Qfundamental_mode;
5309 5309
5310 Qmode_class = intern ("mode-class"); 5310 Qmode_class = intern_c_string ("mode-class");
5311 5311
5312 Qprotected_field = intern ("protected-field"); 5312 Qprotected_field = intern_c_string ("protected-field");
5313 5313
5314 Qpermanent_local = intern ("permanent-local"); 5314 Qpermanent_local = intern_c_string ("permanent-local");
5315 5315
5316 Qkill_buffer_hook = intern ("kill-buffer-hook"); 5316 Qkill_buffer_hook = intern_c_string ("kill-buffer-hook");
5317 Fput (Qkill_buffer_hook, Qpermanent_local, Qt); 5317 Fput (Qkill_buffer_hook, Qpermanent_local, Qt);
5318 5318
5319 Qucs_set_table_for_input = intern ("ucs-set-table-for-input"); 5319 Qucs_set_table_for_input = intern_c_string ("ucs-set-table-for-input");
5320 5320
5321 /* super-magic invisible buffer */ 5321 /* super-magic invisible buffer */
5322 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); 5322 Vprin1_to_string_buffer = Fget_buffer_create (make_pure_c_string (" prin1"));
5323 Vbuffer_alist = Qnil; 5323 Vbuffer_alist = Qnil;
5324 5324
5325 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); 5325 Fset_buffer (Fget_buffer_create (make_pure_c_string ("*scratch*")));
5326 5326
5327 inhibit_modification_hooks = 0; 5327 inhibit_modification_hooks = 0;
5328 } 5328 }
5329 5329
5330 void 5330 void
5449 staticpro (&Qmode_class); 5449 staticpro (&Qmode_class);
5450 staticpro (&QSFundamental); 5450 staticpro (&QSFundamental);
5451 staticpro (&Vbuffer_alist); 5451 staticpro (&Vbuffer_alist);
5452 staticpro (&Qprotected_field); 5452 staticpro (&Qprotected_field);
5453 staticpro (&Qpermanent_local); 5453 staticpro (&Qpermanent_local);
5454 Qpermanent_local_hook = intern ("permanent-local-hook"); 5454 Qpermanent_local_hook = intern_c_string ("permanent-local-hook");
5455 staticpro (&Qpermanent_local_hook); 5455 staticpro (&Qpermanent_local_hook);
5456 staticpro (&Qkill_buffer_hook); 5456 staticpro (&Qkill_buffer_hook);
5457 Qoverlayp = intern ("overlayp"); 5457 Qoverlayp = intern_c_string ("overlayp");
5458 staticpro (&Qoverlayp); 5458 staticpro (&Qoverlayp);
5459 Qevaporate = intern ("evaporate"); 5459 Qevaporate = intern_c_string ("evaporate");
5460 staticpro (&Qevaporate); 5460 staticpro (&Qevaporate);
5461 Qmodification_hooks = intern ("modification-hooks"); 5461 Qmodification_hooks = intern_c_string ("modification-hooks");
5462 staticpro (&Qmodification_hooks); 5462 staticpro (&Qmodification_hooks);
5463 Qinsert_in_front_hooks = intern ("insert-in-front-hooks"); 5463 Qinsert_in_front_hooks = intern_c_string ("insert-in-front-hooks");
5464 staticpro (&Qinsert_in_front_hooks); 5464 staticpro (&Qinsert_in_front_hooks);
5465 Qinsert_behind_hooks = intern ("insert-behind-hooks"); 5465 Qinsert_behind_hooks = intern_c_string ("insert-behind-hooks");
5466 staticpro (&Qinsert_behind_hooks); 5466 staticpro (&Qinsert_behind_hooks);
5467 Qget_file_buffer = intern ("get-file-buffer"); 5467 Qget_file_buffer = intern_c_string ("get-file-buffer");
5468 staticpro (&Qget_file_buffer); 5468 staticpro (&Qget_file_buffer);
5469 Qpriority = intern ("priority"); 5469 Qpriority = intern_c_string ("priority");
5470 staticpro (&Qpriority); 5470 staticpro (&Qpriority);
5471 Qwindow = intern ("window"); 5471 Qwindow = intern_c_string ("window");
5472 staticpro (&Qwindow); 5472 staticpro (&Qwindow);
5473 Qbefore_string = intern ("before-string"); 5473 Qbefore_string = intern_c_string ("before-string");
5474 staticpro (&Qbefore_string); 5474 staticpro (&Qbefore_string);
5475 Qafter_string = intern ("after-string"); 5475 Qafter_string = intern_c_string ("after-string");
5476 staticpro (&Qafter_string); 5476 staticpro (&Qafter_string);
5477 Qfirst_change_hook = intern ("first-change-hook"); 5477 Qfirst_change_hook = intern_c_string ("first-change-hook");
5478 staticpro (&Qfirst_change_hook); 5478 staticpro (&Qfirst_change_hook);
5479 Qbefore_change_functions = intern ("before-change-functions"); 5479 Qbefore_change_functions = intern_c_string ("before-change-functions");
5480 staticpro (&Qbefore_change_functions); 5480 staticpro (&Qbefore_change_functions);
5481 Qafter_change_functions = intern ("after-change-functions"); 5481 Qafter_change_functions = intern_c_string ("after-change-functions");
5482 staticpro (&Qafter_change_functions); 5482 staticpro (&Qafter_change_functions);
5483 /* The next one is initialized in init_buffer_once. */ 5483 /* The next one is initialized in init_buffer_once. */
5484 staticpro (&Qucs_set_table_for_input); 5484 staticpro (&Qucs_set_table_for_input);
5485 5485
5486 Qkill_buffer_query_functions = intern ("kill-buffer-query-functions"); 5486 Qkill_buffer_query_functions = intern_c_string ("kill-buffer-query-functions");
5487 staticpro (&Qkill_buffer_query_functions); 5487 staticpro (&Qkill_buffer_query_functions);
5488 5488
5489 Fput (Qprotected_field, Qerror_conditions, 5489 Fput (Qprotected_field, Qerror_conditions,
5490 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); 5490 pure_cons (Qprotected_field, pure_cons (Qerror, Qnil)));
5491 Fput (Qprotected_field, Qerror_message, 5491 Fput (Qprotected_field, Qerror_message,
5492 build_string ("Attempt to modify a protected field")); 5492 make_pure_c_string ("Attempt to modify a protected field"));
5493 5493
5494 /* All these use DEFVAR_LISP_NOPRO because the slots in 5494 /* All these use DEFVAR_LISP_NOPRO because the slots in
5495 buffer_defaults will all be marked via Vbuffer_defaults. */ 5495 buffer_defaults will all be marked via Vbuffer_defaults. */
5496 5496
5497 DEFVAR_LISP_NOPRO ("default-mode-line-format", 5497 DEFVAR_LISP_NOPRO ("default-mode-line-format",
5767 This variable is buffer-local but you cannot set it directly; 5767 This variable is buffer-local but you cannot set it directly;
5768 use the function `set-buffer-multibyte' to change a buffer's representation. 5768 use the function `set-buffer-multibyte' to change a buffer's representation.
5769 Changing its default value with `setq-default' is supported. 5769 Changing its default value with `setq-default' is supported.
5770 See also variable `default-enable-multibyte-characters' and Info node 5770 See also variable `default-enable-multibyte-characters' and Info node
5771 `(elisp)Text Representations'. */); 5771 `(elisp)Text Representations'. */);
5772 XSYMBOL (intern ("enable-multibyte-characters"))->constant = 1; 5772 XSYMBOL (intern_c_string ("enable-multibyte-characters"))->constant = 1;
5773 5773
5774 DEFVAR_PER_BUFFER ("buffer-file-coding-system", 5774 DEFVAR_PER_BUFFER ("buffer-file-coding-system",
5775 &current_buffer->buffer_file_coding_system, Qnil, 5775 &current_buffer->buffer_file_coding_system, Qnil,
5776 doc: /* Coding system to be used for encoding the buffer contents on saving. 5776 doc: /* Coding system to be used for encoding the buffer contents on saving.
5777 This variable applies to saving the buffer, and also to `write-region' 5777 This variable applies to saving the buffer, and also to `write-region'
6276 6276
6277 DEFVAR_LISP ("change-major-mode-hook", &Vchange_major_mode_hook, 6277 DEFVAR_LISP ("change-major-mode-hook", &Vchange_major_mode_hook,
6278 doc: /* Normal hook run before changing the major mode of a buffer. 6278 doc: /* Normal hook run before changing the major mode of a buffer.
6279 The function `kill-all-local-variables' runs this before doing anything else. */); 6279 The function `kill-all-local-variables' runs this before doing anything else. */);
6280 Vchange_major_mode_hook = Qnil; 6280 Vchange_major_mode_hook = Qnil;
6281 Qchange_major_mode_hook = intern ("change-major-mode-hook"); 6281 Qchange_major_mode_hook = intern_c_string ("change-major-mode-hook");
6282 staticpro (&Qchange_major_mode_hook); 6282 staticpro (&Qchange_major_mode_hook);
6283 6283
6284 defsubr (&Sbuffer_live_p); 6284 defsubr (&Sbuffer_live_p);
6285 defsubr (&Sbuffer_list); 6285 defsubr (&Sbuffer_list);
6286 defsubr (&Sget_buffer); 6286 defsubr (&Sget_buffer);
6338 initial_define_key (control_x_map, 'b', "switch-to-buffer"); 6338 initial_define_key (control_x_map, 'b', "switch-to-buffer");
6339 initial_define_key (control_x_map, 'k', "kill-buffer"); 6339 initial_define_key (control_x_map, 'k', "kill-buffer");
6340 6340
6341 /* This must not be in syms_of_buffer, because Qdisabled is not 6341 /* This must not be in syms_of_buffer, because Qdisabled is not
6342 initialized when that function gets called. */ 6342 initialized when that function gets called. */
6343 Fput (intern ("erase-buffer"), Qdisabled, Qt); 6343 Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt);
6344 } 6344 }
6345 6345
6346 /* arch-tag: e48569bf-69a9-4b65-a23b-8e68769436e1 6346 /* arch-tag: e48569bf-69a9-4b65-a23b-8e68769436e1
6347 (do not change this comment) */ 6347 (do not change this comment) */