comparison src/buffer.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 186992a01a13
children ab71ad6ff3dd
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
1 /* Buffer manipulation primitives for XEmacs. 1 /* Buffer manipulation primitives for XEmacs.
2 Copyright (C) 1985-1989, 1992-1995 Free Software Foundation, Inc. 2 Copyright (C) 1985-1989, 1992-1995 Free Software Foundation, Inc.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing. 4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
242 #define MARKED_SLOT(x) { XD_LISP_OBJECT, offsetof (struct buffer, x) }, 242 #define MARKED_SLOT(x) { XD_LISP_OBJECT, offsetof (struct buffer, x) },
243 #include "bufslots.h" 243 #include "bufslots.h"
244 244
245 { XD_LISP_OBJECT, offsetof (struct buffer, extent_info) }, 245 { XD_LISP_OBJECT, offsetof (struct buffer, extent_info) },
246 246
247 { XD_STRUCT_PTR, offsetof (struct buffer, text), 247 { XD_BLOCK_PTR, offsetof (struct buffer, text),
248 1, &buffer_text_description }, 248 1, &buffer_text_description },
249 { XD_STRUCT_PTR, offsetof (struct buffer, syntax_cache), 249 { XD_BLOCK_PTR, offsetof (struct buffer, syntax_cache),
250 1, &syntax_cache_description }, 250 1, &syntax_cache_description },
251 251
252 { XD_LISP_OBJECT, offsetof (struct buffer, indirect_children) }, 252 { XD_LISP_OBJECT, offsetof (struct buffer, indirect_children) },
253 { XD_LISP_OBJECT, offsetof (struct buffer, base_buffer) }, 253 { XD_LISP_OBJECT, offsetof (struct buffer, base_buffer) },
254 { XD_END } 254 { XD_END }
1137 (buffer)) 1137 (buffer))
1138 { 1138 {
1139 /* This function can call lisp */ 1139 /* This function can call lisp */
1140 Lisp_Object buf; 1140 Lisp_Object buf;
1141 REGISTER struct buffer *b; 1141 REGISTER struct buffer *b;
1142 struct gcpro gcpro1, gcpro2; 1142 struct gcpro gcpro1;
1143 1143
1144 if (NILP (buffer)) 1144 if (NILP (buffer))
1145 buf = Fcurrent_buffer (); 1145 buf = Fcurrent_buffer ();
1146 else if (BUFFERP (buffer)) 1146 else if (BUFFERP (buffer))
1147 buf = buffer; 1147 buf = buffer;
1188 in the question above). 1188 in the question above).
1189 */ 1189 */
1190 if (BUFFER_LIVE_P (b)) 1190 if (BUFFER_LIVE_P (b))
1191 { 1191 {
1192 int speccount = specpdl_depth (); 1192 int speccount = specpdl_depth ();
1193 Lisp_Object tail = Qnil; 1193
1194 1194 GCPRO1 (buf);
1195 GCPRO2 (buf, tail);
1196 record_unwind_protect (save_excursion_restore, save_excursion_save ()); 1195 record_unwind_protect (save_excursion_restore, save_excursion_save ());
1197 Fset_buffer (buf); 1196 Fset_buffer (buf);
1198 1197
1199 /* First run the query functions; if any query is answered no, 1198 {
1200 don't kill the buffer. */ 1199 /* First run the query functions; if any query is answered no,
1201 EXTERNAL_LIST_LOOP (tail, Vkill_buffer_query_functions) 1200 don't kill the buffer. */
1202 { 1201 EXTERNAL_LIST_LOOP_2 (arg, Vkill_buffer_query_functions)
1203 if (NILP (call0 (Fcar (tail)))) 1202 {
1204 { 1203 if (NILP (call0 (arg)))
1205 UNGCPRO; 1204 {
1206 return unbind_to (speccount); 1205 UNGCPRO;
1207 } 1206 return unbind_to (speccount);
1208 } 1207 }
1208 }
1209 }
1209 1210
1210 /* Then run the hooks. */ 1211 /* Then run the hooks. */
1211 run_hook (Qkill_buffer_hook); 1212 run_hook (Qkill_buffer_hook);
1212 1213
1213 /* Inform the selection code that a buffer just got killed. 1214 /* Inform the selection code that a buffer just got killed.
1827 #define ADD_BOOL(field) \ 1828 #define ADD_BOOL(field) \
1828 plist = cons3 (b->text->field ? Qt : Qnil, \ 1829 plist = cons3 (b->text->field ? Qt : Qnil, \
1829 intern_converting_underscores_to_dashes (#field), plist) 1830 intern_converting_underscores_to_dashes (#field), plist)
1830 ADD_INT (bufz); 1831 ADD_INT (bufz);
1831 ADD_INT (z); 1832 ADD_INT (z);
1833 #ifdef OLD_BYTE_CHAR
1832 ADD_INT (mule_bufmin); 1834 ADD_INT (mule_bufmin);
1833 ADD_INT (mule_bufmax); 1835 ADD_INT (mule_bufmax);
1834 ADD_INT (mule_bytmin); 1836 ADD_INT (mule_bytmin);
1835 ADD_INT (mule_bytmax); 1837 ADD_INT (mule_bytmax);
1836 ADD_INT (mule_shifter); 1838 ADD_INT (mule_shifter);
1837 ADD_BOOL (mule_three_p); 1839 ADD_BOOL (mule_three_p);
1840 #endif
1838 ADD_BOOL (entirely_one_byte_p); 1841 ADD_BOOL (entirely_one_byte_p);
1839 ADD_INT (num_ascii_chars); 1842 ADD_INT (num_ascii_chars);
1840 ADD_INT (num_8_bit_fixed_chars); 1843 ADD_INT (num_8_bit_fixed_chars);
1841 ADD_INT (num_16_bit_fixed_chars); 1844 ADD_INT (num_16_bit_fixed_chars);
1845 ADD_INT (cached_charpos);
1846 ADD_INT (cached_bytepos);
1847 ADD_INT (next_cache_pos);
1848
1842 { 1849 {
1843 Lisp_Object pos[16]; 1850 Lisp_Object pos[NUM_CACHED_POSITIONS];
1844 int i; 1851 int i;
1845 for (i = 0; i < 16; i++) 1852 for (i = 0; i < b->text->next_cache_pos; i++)
1846 pos[i] = make_int (b->text->mule_charbpos_cache[i]); 1853 pos[i] = make_int (b->text->mule_charbpos_cache[i]);
1847 plist = cons3 (Flist (16, pos), intern ("mule-charbpos-cache"), plist); 1854 plist = cons3 (Flist (b->text->next_cache_pos, pos),
1848 for (i = 0; i < 16; i++) 1855 intern ("mule-charbpos-cache"), plist);
1856 for (i = 0; i < b->text->next_cache_pos; i++)
1849 pos[i] = make_int (b->text->mule_bytebpos_cache[i]); 1857 pos[i] = make_int (b->text->mule_bytebpos_cache[i]);
1850 plist = cons3 (Flist (16, pos), intern ("mule-bytebpos-cache"), plist); 1858 plist = cons3 (Flist (b->text->next_cache_pos, pos),
1859 intern ("mule-bytebpos-cache"), plist);
1851 } 1860 }
1852 #undef ADD_INT 1861 #undef ADD_INT
1853 #undef ADD_BOOL 1862 #undef ADD_BOOL
1854 1863
1855 return Fnreverse (plist); 1864 return Fnreverse (plist);
1961 /* initialize the buffer routines */ 1970 /* initialize the buffer routines */
1962 void 1971 void
1963 vars_of_buffer (void) 1972 vars_of_buffer (void)
1964 { 1973 {
1965 /* This function can GC */ 1974 /* This function can GC */
1966 reinit_vars_of_buffer ();
1967
1968 staticpro (&QSFundamental); 1975 staticpro (&QSFundamental);
1969 staticpro (&QSscratch); 1976 staticpro (&QSscratch);
1970 1977
1971 QSFundamental = build_string ("Fundamental"); 1978 QSFundamental = build_string ("Fundamental");
1972 QSscratch = build_string (DEFER_GETTEXT ("*scratch*")); 1979 QSscratch = build_string (DEFER_GETTEXT ("*scratch*"));
2329 2336
2330 defs = XBUFFER (Vbuffer_defaults); 2337 defs = XBUFFER (Vbuffer_defaults);
2331 syms = XBUFFER (Vbuffer_local_symbols); 2338 syms = XBUFFER (Vbuffer_local_symbols);
2332 buffer_defaults_saved_slots = &defs->BUFFER_SLOTS_FIRST_NAME; 2339 buffer_defaults_saved_slots = &defs->BUFFER_SLOTS_FIRST_NAME;
2333 buffer_local_symbols_saved_slots = &syms->BUFFER_SLOTS_FIRST_NAME; 2340 buffer_local_symbols_saved_slots = &syms->BUFFER_SLOTS_FIRST_NAME;
2334 dump_add_root_struct_ptr (&buffer_defaults_saved_slots, &buffer_slots_description); 2341 dump_add_root_block_ptr (&buffer_defaults_saved_slots, &buffer_slots_description);
2335 dump_add_root_struct_ptr (&buffer_local_symbols_saved_slots, &buffer_slots_description); 2342 dump_add_root_block_ptr (&buffer_local_symbols_saved_slots, &buffer_slots_description);
2336 2343
2337 DEFVAR_BUFFER_DEFAULTS ("default-modeline-format", modeline_format /* 2344 DEFVAR_BUFFER_DEFAULTS ("default-modeline-format", modeline_format /*
2338 Default value of `modeline-format' for buffers that don't override it. 2345 Default value of `modeline-format' for buffers that don't override it.
2339 This is the same as (default-value 'modeline-format). 2346 This is the same as (default-value 'modeline-format).
2340 */ ); 2347 */ );