aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorPip Cet2021-05-16 15:44:26 +0200
committerStefan Monnier2022-07-01 18:59:35 -0400
commitb6a526361b57f8d9f6d5078ccd97832d0a1fb036 (patch)
tree0c752a1c74920a2b731bb2e3c2ff6623be240a72 /src/buffer.c
parent3daf833ff3f3e99b44731808cb197c0912649997 (diff)
downloademacs-scratch/no-purespace-old.tar.gz
emacs-scratch/no-purespace-old.zip
Remove purespace and ancillary codescratch/no-purespace-old
Now that purespace is not used any more, remove it, along with the functions used to allocate into it. Use equivalent functions allocating into the normal heap. Remove calls to PURE_P since they always return false. * src/puresize.h: Delete file. * src/alloc.c: Don't include `puresize.h` any more. (pure, purebeg, pure_size, pure_bytes_used_before_overflow) (pure_bytes_used_lisp, pure_bytes_used_non_lisp, symbol_block_pinned) (pinned_objects): Delete vars. (PUREBEG): Delete macro. (pointer_align): Move after definition of USE_ALIGNED_ALLOC and only define it if USE_ALIGNED_ALLOC is not used. (cons_listn): Remove `cons` arg, hardcode `Fcons` instead. (pure_listn, pure_alloc, check_pure_size, make_pure_string) (make_pure_c_string, pure_cons): Delete functions. (init_symbol): Don't set `pinned` any more. (mark_pinned_objects, mark_pinned_symbols): Delete functions. (garbage_collect): Don't call them any more. (init_alloc_once_for_pdumper): Don't initialize purebeg and pure_size. * src/print.c (print_object) <PVEC_HASH_TABLE>: Don't print `purecopy`. * src/pdumper.c (dump_symbol, dump_hash_table): Update sig hash. (dump_symbol): Don't dump `pinned`. (dump_hash_table): Don't dump `purecopy`. * src/lread.c (readevalloop, read_internal_start): Adjust call to `make_hash_table`. (read0, intern_c_string_1, define_symbol, Fintern): Don't purify symbol names. (string): Avoid `pure_cons` and `build_pure_c_string`. * src/lisp.h (struct Lisp_Symbol): Remove `pinned` field. (struct Lisp_Hash_Table): Remove `purecopy` field. (check_pure_size, pure_listn, pure_list, make_pure_string) (make_pure_c_string, pure_cons): Remove prototypes. (build_pure_c_string): Delete function. * src/keymap.c: Don't include `puresize.h` any more. (Fmake_sparse_keymap): Don't purecopy the menu name. (Fset_keymap_parent, store_in_keymap): Don't `CHECK_IMPURE` any more. (syms_of_keymap): Avoid `pure_cons` and `build_pure_c_string`. * src/intervals.c: Don't include `puresize.h` any more. (create_root_interval): Don't `CHECK_IMPURE` any more. * src/fns.c: Don't include `puresize.h` any more. (Ffillarray, Fclear_string): Don't `CHECK_IMPURE` any more. (make_hash_table): Remove `purecopy` arg. (Fmake_hash_table): Remove `:purecopy` keyword argument. * src/eval.c (Finternal__define_uninitialized_variable): Don't purecopy the doc any more. (Fdefconst_1): Don't purecopy the initvalue any more. (Fautoload): Get rid of hack needed when we used hash-consing. (syms_of_eval): Avoid `build_pure_c_string`. * src/emacs.c: Don't include `puresize.h` any more. (Fdump_emacs): Don't `check_pure_size`. * src/doc.c (Fsnarf_documentation): Don't purecopy the build files. * src/deps.mk: Remove puresize.h. * src/data.c: Don't include `puresize.h` any more. (pure_write_error): Delete function. (Fsetcar, Fsetcdr): Don't `CHECK_IMPURE` any more. (Fdefalias): Don't purecopy the definition any more. (Faset): Don't `CHECK_IMPURE` any more. (syms_of_data): Avoid `pure_cons` and `build_pure_c_string`. * src/conf_post.h (SYSTEM_PURESIZE_EXTRA): Delete macro. * src/comp.c: Don't include `puresize.h` any more. (helper_link_table): Remove `pure_write_error`. (define_CHECK_IMPURE): Delete function. (maybe_defer_native_compilation, syms_of_comp): Avoid `build_pure_c_string`. * src/category.c (hash_get_category_set): Update call to `make_hash_table`. (Fdefine_category): Don't purecopy the docstring any more. * src/bytecode.c: Don't include `puresize.h` any more. (Bsetcar, Bsetcdr): Don't `CHECK_IMPURE` any more. * doc/lispref/internals.texi (Pure Storage): Delete section. (Garbage Collection): Remove note about purespace overflow. * src/xfaces.c (syms_of_xfaces): * src/emacs-module.c (syms_of_module): * src/frame.c (make_frame, make_initial_frame): * src/fileio.c (syms_of_fileio): * src/image.c (xpm_make_color_table_h): * src/process.c (ADD_SUBFEATURE, syms_of_process): * src/profiler.c (make_log): * src/json.c (define_error): * src/xterm.c (syms_of_xterm): * src/xfns.c (syms_of_xfns): * src/xdisp.c (syms_of_xdisp): * src/w32fns.c (syms_of_w32fns): * src/syntax.c (syms_of_syntax): * src/sqlite.c (syms_of_sqlite): * src/search.c (syms_of_search): * src/keyboard.c (syms_of_keyboard): * src/fontset.c (syms_of_fontset): * src/dbusbind.c (syms_of_dbusbind): * src/coding.c (syms_of_coding): * src/callint.c (syms_of_callint): * src/buffer.c (init_buffer_once, syms_of_buffer): Avoid `build_pure_c_string`, `Fpurecopy`, `pure_cons`, and `pure_list`, and adjust calls to `make_hash_table`.
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 509ce51b55e..834a4a03b5b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5308,8 +5308,8 @@ init_buffer_once (void)
5308 set_buffer_intervals (&buffer_defaults, NULL); 5308 set_buffer_intervals (&buffer_defaults, NULL);
5309 set_buffer_intervals (&buffer_local_symbols, NULL); 5309 set_buffer_intervals (&buffer_local_symbols, NULL);
5310 /* This is not strictly necessary, but let's make them initialized. */ 5310 /* This is not strictly necessary, but let's make them initialized. */
5311 bset_name (&buffer_defaults, build_pure_c_string (" *buffer-defaults*")); 5311 bset_name (&buffer_defaults, build_string (" *buffer-defaults*"));
5312 bset_name (&buffer_local_symbols, build_pure_c_string (" *buffer-local-symbols*")); 5312 bset_name (&buffer_local_symbols, build_string (" *buffer-local-symbols*"));
5313 BUFFER_PVEC_INIT (&buffer_defaults); 5313 BUFFER_PVEC_INIT (&buffer_defaults);
5314 BUFFER_PVEC_INIT (&buffer_local_symbols); 5314 BUFFER_PVEC_INIT (&buffer_local_symbols);
5315 5315
@@ -5317,7 +5317,7 @@ init_buffer_once (void)
5317 /* Must do these before making the first buffer! */ 5317 /* Must do these before making the first buffer! */
5318 5318
5319 /* real setup is done in bindings.el */ 5319 /* real setup is done in bindings.el */
5320 bset_mode_line_format (&buffer_defaults, build_pure_c_string ("%-")); 5320 bset_mode_line_format (&buffer_defaults, build_string ("%-"));
5321 bset_header_line_format (&buffer_defaults, Qnil); 5321 bset_header_line_format (&buffer_defaults, Qnil);
5322 bset_tab_line_format (&buffer_defaults, Qnil); 5322 bset_tab_line_format (&buffer_defaults, Qnil);
5323 bset_abbrev_mode (&buffer_defaults, Qnil); 5323 bset_abbrev_mode (&buffer_defaults, Qnil);
@@ -5384,7 +5384,7 @@ init_buffer_once (void)
5384 current_buffer = 0; 5384 current_buffer = 0;
5385 pdumper_remember_lv_ptr_raw (&current_buffer, Lisp_Vectorlike); 5385 pdumper_remember_lv_ptr_raw (&current_buffer, Lisp_Vectorlike);
5386 5386
5387 QSFundamental = build_pure_c_string ("Fundamental"); 5387 QSFundamental = build_string ("Fundamental");
5388 5388
5389 DEFSYM (Qfundamental_mode, "fundamental-mode"); 5389 DEFSYM (Qfundamental_mode, "fundamental-mode");
5390 bset_major_mode (&buffer_defaults, Qfundamental_mode); 5390 bset_major_mode (&buffer_defaults, Qfundamental_mode);
@@ -5398,10 +5398,10 @@ init_buffer_once (void)
5398 5398
5399 /* Super-magic invisible buffer. */ 5399 /* Super-magic invisible buffer. */
5400 Vprin1_to_string_buffer = 5400 Vprin1_to_string_buffer =
5401 Fget_buffer_create (build_pure_c_string (" prin1"), Qt); 5401 Fget_buffer_create (build_string (" prin1"), Qt);
5402 Vbuffer_alist = Qnil; 5402 Vbuffer_alist = Qnil;
5403 5403
5404 Fset_buffer (Fget_buffer_create (build_pure_c_string ("*scratch*"), Qnil)); 5404 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"), Qnil));
5405 5405
5406 inhibit_modification_hooks = 0; 5406 inhibit_modification_hooks = 0;
5407} 5407}
@@ -5584,9 +5584,9 @@ syms_of_buffer (void)
5584 Qoverwrite_mode_binary)); 5584 Qoverwrite_mode_binary));
5585 5585
5586 Fput (Qprotected_field, Qerror_conditions, 5586 Fput (Qprotected_field, Qerror_conditions,
5587 pure_list (Qprotected_field, Qerror)); 5587 list (Qprotected_field, Qerror));
5588 Fput (Qprotected_field, Qerror_message, 5588 Fput (Qprotected_field, Qerror_message,
5589 build_pure_c_string ("Attempt to modify a protected field")); 5589 build_string ("Attempt to modify a protected field"));
5590 5590
5591 DEFSYM (Qclone_indirect_buffer_hook, "clone-indirect-buffer-hook"); 5591 DEFSYM (Qclone_indirect_buffer_hook, "clone-indirect-buffer-hook");
5592 5592