comparison src/extents.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 04bc9d2f42c7
children 3d8143fc88e1
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
262 the others -- the offset to the data past the gap, plus the number 262 the others -- the offset to the data past the gap, plus the number
263 of elements in that data: 263 of elements in that data:
264 264
265 offset_past_gap = elsize * (gap + gapsize) 265 offset_past_gap = elsize * (gap + gapsize)
266 els_past_gap = numels - gap 266 els_past_gap = numels - gap
267
268 #### The current layout will not cut it for dumping purposes. If we
269 need to dump one of these structures, we will have to rearrange things
270 so that the gap array data and other fields are in one single memory
271 block. Either this is a pointer off of struct gap_array, or it is
272 struct gap_array itself; in the latter case, the interface below has to
273 be modified so that functions that change the array pass in a ** rather
274 than a *, since the pointer may move.
275 */ 267 */
276 268
277 269
278 typedef struct gap_array 270 typedef struct gap_array
279 { 271 {
1034 static void soe_invalidate (Lisp_Object obj); 1026 static void soe_invalidate (Lisp_Object obj);
1035 1027
1036 extern const struct sized_memory_description gap_array_marker_description; 1028 extern const struct sized_memory_description gap_array_marker_description;
1037 1029
1038 static const struct memory_description gap_array_marker_description_1[] = { 1030 static const struct memory_description gap_array_marker_description_1[] = {
1039 { XD_STRUCT_PTR, offsetof (Gap_Array_Marker, next), 1, 1031 { XD_BLOCK_PTR, offsetof (Gap_Array_Marker, next), 1,
1040 &gap_array_marker_description }, 1032 &gap_array_marker_description },
1041 { XD_END } 1033 { XD_END }
1042 }; 1034 };
1043 1035
1044 const struct sized_memory_description gap_array_marker_description = { 1036 const struct sized_memory_description gap_array_marker_description = {
1048 1040
1049 static const struct memory_description lispobj_gap_array_description_1[] = { 1041 static const struct memory_description lispobj_gap_array_description_1[] = {
1050 { XD_INT, offsetof (Gap_Array, gap) }, 1042 { XD_INT, offsetof (Gap_Array, gap) },
1051 { XD_INT, offsetof (Gap_Array, offset_past_gap) }, 1043 { XD_INT, offsetof (Gap_Array, offset_past_gap) },
1052 { XD_INT, offsetof (Gap_Array, els_past_gap) }, 1044 { XD_INT, offsetof (Gap_Array, els_past_gap) },
1053 { XD_STRUCT_PTR, offsetof (Gap_Array, markers), 1, 1045 { XD_BLOCK_PTR, offsetof (Gap_Array, markers), 1,
1054 &gap_array_marker_description, XD_FLAG_NO_KKCC }, 1046 &gap_array_marker_description, XD_FLAG_NO_KKCC },
1055 { XD_STRUCT_ARRAY, offsetof (Gap_Array, array), XD_INDIRECT (0, 0), 1047 { XD_BLOCK_ARRAY, offsetof (Gap_Array, array), XD_INDIRECT (0, 0),
1056 &lisp_object_description }, 1048 &lisp_object_description },
1057 { XD_STRUCT_ARRAY, XD_INDIRECT (1, offsetof (Gap_Array, array)), 1049 { XD_BLOCK_ARRAY, XD_INDIRECT (1, offsetof (Gap_Array, array)),
1058 XD_INDIRECT (2, 0), &lisp_object_description }, 1050 XD_INDIRECT (2, 0), &lisp_object_description },
1059 { XD_END } 1051 { XD_END }
1060 }; 1052 };
1061 1053
1062 static const struct sized_memory_description lispobj_gap_array_description = { 1054 static const struct sized_memory_description lispobj_gap_array_description = {
1065 }; 1057 };
1066 1058
1067 extern const struct sized_memory_description extent_list_marker_description; 1059 extern const struct sized_memory_description extent_list_marker_description;
1068 1060
1069 static const struct memory_description extent_list_marker_description_1[] = { 1061 static const struct memory_description extent_list_marker_description_1[] = {
1070 { XD_STRUCT_PTR, offsetof (Extent_List_Marker, m), 1, 1062 { XD_BLOCK_PTR, offsetof (Extent_List_Marker, m), 1,
1071 &gap_array_marker_description }, 1063 &gap_array_marker_description },
1072 { XD_STRUCT_PTR, offsetof (Extent_List_Marker, next), 1, 1064 { XD_BLOCK_PTR, offsetof (Extent_List_Marker, next), 1,
1073 &extent_list_marker_description }, 1065 &extent_list_marker_description },
1074 { XD_END } 1066 { XD_END }
1075 }; 1067 };
1076 1068
1077 const struct sized_memory_description extent_list_marker_description = { 1069 const struct sized_memory_description extent_list_marker_description = {
1078 sizeof (Extent_List_Marker), 1070 sizeof (Extent_List_Marker),
1079 extent_list_marker_description_1 1071 extent_list_marker_description_1
1080 }; 1072 };
1081 1073
1082 static const struct memory_description extent_list_description_1[] = { 1074 static const struct memory_description extent_list_description_1[] = {
1083 { XD_STRUCT_PTR, offsetof (Extent_List, start), 1, &lispobj_gap_array_description }, 1075 { XD_BLOCK_PTR, offsetof (Extent_List, start), 1, &lispobj_gap_array_description },
1084 { XD_STRUCT_PTR, offsetof (Extent_List, end), 1, &lispobj_gap_array_description, XD_FLAG_NO_KKCC }, 1076 { XD_BLOCK_PTR, offsetof (Extent_List, end), 1, &lispobj_gap_array_description, XD_FLAG_NO_KKCC },
1085 { XD_STRUCT_PTR, offsetof (Extent_List, markers), 1, &extent_list_marker_description, XD_FLAG_NO_KKCC }, 1077 { XD_BLOCK_PTR, offsetof (Extent_List, markers), 1, &extent_list_marker_description, XD_FLAG_NO_KKCC },
1086 { XD_END } 1078 { XD_END }
1087 }; 1079 };
1088 1080
1089 static const struct sized_memory_description extent_list_description = { 1081 static const struct sized_memory_description extent_list_description = {
1090 sizeof (Extent_List), 1082 sizeof (Extent_List),
1091 extent_list_description_1 1083 extent_list_description_1
1092 }; 1084 };
1093 1085
1094 static const struct memory_description stack_of_extents_description_1[] = { 1086 static const struct memory_description stack_of_extents_description_1[] = {
1095 { XD_STRUCT_PTR, offsetof (Stack_Of_Extents, extents), 1, &extent_list_description }, 1087 { XD_BLOCK_PTR, offsetof (Stack_Of_Extents, extents), 1, &extent_list_description },
1096 { XD_END } 1088 { XD_END }
1097 }; 1089 };
1098 1090
1099 static const struct sized_memory_description stack_of_extents_description = { 1091 static const struct sized_memory_description stack_of_extents_description = {
1100 sizeof (Stack_Of_Extents), 1092 sizeof (Stack_Of_Extents),
1101 stack_of_extents_description_1 1093 stack_of_extents_description_1
1102 }; 1094 };
1103 1095
1104 static const struct memory_description extent_info_description [] = { 1096 static const struct memory_description extent_info_description [] = {
1105 { XD_STRUCT_PTR, offsetof (struct extent_info, extents), 1, 1097 { XD_BLOCK_PTR, offsetof (struct extent_info, extents), 1,
1106 &extent_list_description }, 1098 &extent_list_description },
1107 { XD_STRUCT_PTR, offsetof (struct extent_info, soe), 1, 1099 { XD_BLOCK_PTR, offsetof (struct extent_info, soe), 1,
1108 &stack_of_extents_description, XD_FLAG_NO_KKCC }, 1100 &stack_of_extents_description, XD_FLAG_NO_KKCC },
1109 { XD_END } 1101 { XD_END }
1110 }; 1102 };
1111 1103
1112 static Lisp_Object 1104 static Lisp_Object
4975 4967
4976 if (!CONSP (hook) || EQ (XCAR (hook), Qlambda)) 4968 if (!CONSP (hook) || EQ (XCAR (hook), Qlambda))
4977 call3 (hook, exobj, startobj, endobj); 4969 call3 (hook, exobj, startobj, endobj);
4978 else 4970 else
4979 { 4971 {
4980 Lisp_Object tail; 4972 EXTERNAL_LIST_LOOP_2 (elt, hook)
4981 EXTERNAL_LIST_LOOP (tail, hook)
4982 /* #### Shouldn't this perform the same Fset_buffer() check as 4973 /* #### Shouldn't this perform the same Fset_buffer() check as
4983 above? */ 4974 above? */
4984 call3 (XCAR (tail), exobj, startobj, endobj); 4975 call3 (elt, exobj, startobj, endobj);
4985 } 4976 }
4986 return 0; 4977 return 0;
4987 } 4978 }
4988 4979
4989 void 4980 void
5090 oldtail = XCDR (cons); 5081 oldtail = XCDR (cons);
5091 XCDR (cons) = Qnil; 5082 XCDR (cons) = Qnil;
5092 } 5083 }
5093 5084
5094 thecons = Vextent_face_reusable_list; 5085 thecons = Vextent_face_reusable_list;
5095 EXTERNAL_LIST_LOOP (cons, list) 5086 {
5096 { 5087 EXTERNAL_LIST_LOOP_2 (face, list)
5097 Lisp_Object face = Fget_face (XCAR (cons)); 5088 {
5098 5089 face = Fget_face (face);
5099 XCAR (thecons) = Fface_name (face); 5090
5100 thecons = XCDR (thecons); 5091 XCAR (thecons) = Fface_name (face);
5101 } 5092 thecons = XCDR (thecons);
5093 }
5094 }
5102 5095
5103 list = Fgethash (Vextent_face_reusable_list, Vextent_face_memoize_hash_table, 5096 list = Fgethash (Vextent_face_reusable_list, Vextent_face_memoize_hash_table,
5104 Qnil); 5097 Qnil);
5105 if (NILP (list)) 5098 if (NILP (list))
5106 { 5099 {
7390 } 7383 }
7391 7384
7392 void 7385 void
7393 vars_of_extents (void) 7386 vars_of_extents (void)
7394 { 7387 {
7395 reinit_vars_of_extents ();
7396
7397 DEFVAR_INT ("mouse-highlight-priority", &mouse_highlight_priority /* 7388 DEFVAR_INT ("mouse-highlight-priority", &mouse_highlight_priority /*
7398 The priority to use for the mouse-highlighting pseudo-extent 7389 The priority to use for the mouse-highlighting pseudo-extent
7399 that is used to highlight extents with the `mouse-face' attribute set. 7390 that is used to highlight extents with the `mouse-face' attribute set.
7400 See `set-extent-priority'. 7391 See `set-extent-priority'.
7401 */ ); 7392 */ );