[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.

--- a/src/buffer.h	Thu Nov 04 22:51:31 2004 +0000
+++ b/src/buffer.h	Thu Nov 04 23:08:28 2004 +0000
@@ -2,7 +2,7 @@
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 2001, 2002 Ben Wing.
+   Copyright (C) 2001, 2002, 2004 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -74,12 +74,16 @@
    extent-parent and extent-children.
    */
 
+#define NUM_CACHED_POSITIONS 50
+#define NUM_MOVED_POSITIONS 10
+
 struct buffer_text
 {
   Ibyte *beg;		/* Actual address of buffer contents. */
   Bytebpos gpt;		/* Index of gap in buffer. */
+  Charbpos bufgpt;	/* Equivalent as a Charbpos. */
   Bytebpos z;		/* Index of end of buffer. */
-  Charbpos bufz;		/* Equivalent as a Charbpos. */
+  Charbpos bufz;	/* Equivalent as a Charbpos. */
   Bytecount gap_size;/* Size of buffer's gap */
   Bytecount end_gap_size;/* Size of buffer's end gap */
   long modiff;		/* This counts buffer-modification events
@@ -90,6 +94,8 @@
 			   time buffer visited or saved a file.  */
 
 #ifdef MULE
+
+#ifdef OLD_BYTE_CHAR
   /* We keep track of a "known" region for very fast access.  This
      information is text-only so it goes here.  We update this at each
      change to the buffer, so if it's entirely ASCII, these will always
@@ -97,11 +103,16 @@
   Charbpos mule_bufmin, mule_bufmax;
   Bytebpos mule_bytmin, mule_bytmax;
   int mule_shifter, mule_three_p;
+#endif
 
-  /* And we also cache 16 positions for fairly fast access near those
-     positions. */
-  Charbpos mule_charbpos_cache[16];
-  Bytebpos mule_bytebpos_cache[16];
+  /* And we also cache NUM_CACHED_POSITIONS positions for fairly fast
+     access near those positions. */
+  Charbpos mule_charbpos_cache[NUM_CACHED_POSITIONS];
+  Bytebpos mule_bytebpos_cache[NUM_CACHED_POSITIONS];
+  int next_cache_pos;
+
+  Charbpos cached_charpos;
+  Bytebpos cached_bytepos;
 
   /* True if all chars fit into one byte;
      == (format == FORMAT_8_BIT_FIXED ||
@@ -117,7 +128,7 @@
   
   /* Currently we only handle 8 bit fixed and default */
   Internal_Format format;
-#endif
+#endif /* MULE */
 
   /* Similar to the above, we keep track of positions for which line
      number has last been calculated.  See line-number.c. */
@@ -312,6 +323,10 @@
 #define BYTE_BUF_Z(buf) ((buf)->text->z + 0)
 #define BUF_Z(buf) ((buf)->text->bufz + 0)
 
+/* Gap location.  */
+#define BYTE_BUF_GPT(buf) ((buf)->text->gpt + 0)
+#define BUF_GPT(buf) ((buf)->text->bufgpt + 0)
+
 /* Point. */
 #define BYTE_BUF_PT(buf) ((buf)->pt + 0)
 #define BUF_PT(buf) ((buf)->bufpt + 0)
@@ -536,69 +551,14 @@
 /*	   Converting between byte and character positions		*/
 /*----------------------------------------------------------------------*/
 
-#ifdef MULE
-
-/* The basic algorithm we use is to keep track of a known region of
-   characters in each buffer, all of which are of the same width.  We keep
-   track of the boundaries of the region in both Charbpos and Bytebpos
-   coordinates and also keep track of the char width, which is 1 - 4 bytes.
-   If the position we're translating is not in the known region, then we
-   invoke a function to update the known region to surround the position in
-   question.  This assumes locality of reference, which is usually the
-   case.
+/*
 
-   Note that the function to update the known region can be simple or
-   complicated depending on how much information we cache.  In addition to
-   the known region, we always cache the correct conversions for point,
-   BEGV, and ZV, and in addition to this we cache 16 positions where the
-   conversion is known.  We only look in the cache or update it when we
-   need to move the known region more than a certain amount (currently 50
-   chars), and then we throw away a "random" value and replace it with the
-   newly calculated value.
-
-   Finally, we maintain an extra flag that tracks whether the buffer is
-   entirely ASCII, to speed up the conversions even more.  This flag is
-   actually of dubious value because in an entirely-ASCII buffer the known
-   region will always span the entire buffer (in fact, we update the flag
-   based on this fact), and so all we're saving is a few machine cycles.
+Info on Byte-Char conversion:
 
-   A potentially smarter method than what we do with known regions and
-   cached positions would be to keep some sort of pseudo-extent layer over
-   the buffer; maybe keep track of the charbpos/bytebpos correspondence at the
-   beginning of each line, which would allow us to do a binary search over
-   the pseudo-extents to narrow things down to the correct line, at which
-   point you could use a linear movement method.  This would also mesh well
-   with efficiently implementing a line-numbering scheme.  However, you
-   have to weigh the amount of time spent updating the cache vs. the
-   savings that result from it.  In reality, we modify the buffer far less
-   often than we access it, so a cache of this sort that provides
-   guaranteed LOG (N) performance (or perhaps N * LOG (N), if we set a
-   maximum on the cache size) would indeed be a win, particularly in very
-   large buffers.  If we ever implement this, we should probably set a
-   reasonably high minimum below which we use the old method, because the
-   time spent updating the fancy cache would likely become dominant when
-   making buffer modifications in smaller buffers.
+  (Info-goto-node "(internals)Byte-Char Position Conversion")
+*/
 
-   Note also that we have to multiply or divide by the char width in order
-   to convert the positions.  We do some tricks to avoid ever actually
-   having to do a multiply or divide, because that is typically an
-   expensive operation (esp. divide).  Multiplying or dividing by 1, 2, or
-   4 can be implemented simply as a shift left or shift right, and we keep
-   track of a shifter value (0, 1, or 2) indicating how much to shift.
-   Multiplying by 3 can be implemented by doubling and then adding the
-   original value.  Dividing by 3, alas, cannot be implemented in any
-   simple shift/subtract method, as far as I know; so we just do a table
-   lookup.  For simplicity, we use a table of size 128K, which indexes the
-   "divide-by-3" values for the first 64K non-negative numbers. (Note that
-   we can increase the size up to 384K, i.e. indexing the first 192K
-   non-negative numbers, while still using shorts in the array.) This also
-   means that the size of the known region can be at most 64K for
-   width-three characters.
-
-   !!#### We should investigate the algorithm in GNU Emacs.  I think it
-   does something similar, but it may differ in some details, and it's
-   worth seeing if anything can be gleaned.
-   */
+#ifdef MULE
 
 Bytebpos charbpos_to_bytebpos_func (struct buffer *buf, Charbpos x);
 Charbpos bytebpos_to_charbpos_func (struct buffer *buf, Bytebpos x);
@@ -623,11 +583,13 @@
     retval = (Bytebpos) (x << 1);
   else if (BUF_FORMAT (buf) == FORMAT_32_BIT_FIXED)
     retval = (Bytebpos) (x << 2);
+#ifdef OLD_BYTE_CHAR
   else if (x >= buf->text->mule_bufmin && x <= buf->text->mule_bufmax)
     retval = (buf->text->mule_bytmin +
 	    ((x - buf->text->mule_bufmin) << buf->text->mule_shifter) +
 	    (buf->text->mule_three_p ? (x - buf->text->mule_bufmin) :
 	     (Bytebpos) 0));
+#endif /* OLD_BYTE_CHAR */
   else
     retval = charbpos_to_bytebpos_func (buf, x);
 #else
@@ -654,11 +616,13 @@
     retval = (Charbpos) (x >> 1);
   else if (BUF_FORMAT (buf) == FORMAT_32_BIT_FIXED)
     retval = (Charbpos) (x >> 2);
+#ifdef OLD_BYTE_CHAR
   else if (x >= buf->text->mule_bytmin && x <= buf->text->mule_bytmax)
     retval = (buf->text->mule_bufmin +
 	      ((buf->text->mule_three_p
 		? three_to_one_table[x - buf->text->mule_bytmin]
 		: (x - buf->text->mule_bytmin) >> buf->text->mule_shifter)));
+#endif /* OLD_BYTE_CHAR */
   else
     retval = bytebpos_to_charbpos_func (buf, x);
 #else
@@ -1071,41 +1035,42 @@
   representation is changed to have multiple gaps in it.
   */
 
-
 /*  Return the maximum position in the buffer it is safe to scan forwards
     past N to.  This is used to prevent buffer scans from running into
     the gap (e.g. search.c).  All characters between N and CEILING_OF(N)
     are located contiguous in memory.  Note that the character *at*
     CEILING_OF(N) is not contiguous in memory. */
 #define BYTE_BUF_CEILING_OF(b, n)					\
-  ((n) < (b)->text->gpt && (b)->text->gpt < BYTE_BUF_ZV (b) ?		\
-   (b)->text->gpt : BYTE_BUF_ZV (b))
-#define BUF_CEILING_OF(b, n)						\
-  bytebpos_to_charbpos (b, BYTE_BUF_CEILING_OF (b, charbpos_to_bytebpos (b, n)))
+  ((n) < BYTE_BUF_GPT (b) && BYTE_BUF_GPT (b) < BYTE_BUF_ZV (b) ?	\
+   BYTE_BUF_GPT (b) : BYTE_BUF_ZV (b))
+#define BUF_CEILING_OF(b, n)				\
+  ((n) < BUF_GPT (b) && BUF_GPT (b) < BUF_ZV (b) ?	\
+   BUF_GPT (b) : BUF_ZV (b))
 
 /*  Return the minimum position in the buffer it is safe to scan backwards
     past N to.  All characters between FLOOR_OF(N) and N are located
     contiguous in memory.  Note that the character *at* N may not be
     contiguous in memory. */
-#define BYTE_BUF_FLOOR_OF(b, n)						\
-        (BYTE_BUF_BEGV (b) < (b)->text->gpt && (b)->text->gpt < (n) ?	\
-	 (b)->text->gpt : BYTE_BUF_BEGV (b))
-#define BUF_FLOOR_OF(b, n)						\
-  bytebpos_to_charbpos (b, BYTE_BUF_FLOOR_OF (b, charbpos_to_bytebpos (b, n)))
+#define BYTE_BUF_FLOOR_OF(b, n)						  \
+        (BYTE_BUF_BEGV (b) < BYTE_BUF_GPT (b) && BYTE_BUF_GPT (b) < (n) ? \
+	 BYTE_BUF_GPT (b) : BYTE_BUF_BEGV (b))
+#define BUF_FLOOR_OF(b, n)					\
+        (BUF_BEGV (b) < BUF_GPT (b) && BUF_GPT (b) < (n) ?	\
+	 BUF_GPT (b) : BUF_BEGV (b))
 
 #define BYTE_BUF_CEILING_OF_IGNORE_ACCESSIBLE(b, n)			\
-  ((n) < (b)->text->gpt && (b)->text->gpt < BYTE_BUF_Z (b) ?		\
-   (b)->text->gpt : BYTE_BUF_Z (b))
-#define BUF_CEILING_OF_IGNORE_ACCESSIBLE(b, n) 				\
-  bytebpos_to_charbpos							\
-   (b, BYTE_BUF_CEILING_OF_IGNORE_ACCESSIBLE (b, charbpos_to_bytebpos (b, n)))
+  ((n) < BYTE_BUF_GPT (b) && BYTE_BUF_GPT (b) < BYTE_BUF_Z (b) ?	\
+   BYTE_BUF_GPT (b) : BYTE_BUF_Z (b))
+#define BUF_CEILING_OF_IGNORE_ACCESSIBLE(b, n)		\
+  ((n) < BUF_GPT (b) && BUF_GPT (b) < BUF_Z (b) ?	\
+   BUF_GPT (b) : BUF_Z (b))
 
-#define BYTE_BUF_FLOOR_OF_IGNORE_ACCESSIBLE(b, n)				\
-        (BYTE_BUF_BEG (b) < (b)->text->gpt && (b)->text->gpt < (n) ?	\
-	 (b)->text->gpt : BYTE_BUF_BEG (b))
-#define BUF_FLOOR_OF_IGNORE_ACCESSIBLE(b, n) 				\
-  bytebpos_to_charbpos							\
-   (b, BYTE_BUF_FLOOR_OF_IGNORE_ACCESSIBLE (b, charbpos_to_bytebpos (b, n)))
+#define BYTE_BUF_FLOOR_OF_IGNORE_ACCESSIBLE(b, n)			 \
+        (BYTE_BUF_BEG (b) < BYTE_BUF_GPT (b) && BYTE_BUF_GPT (b) < (n) ? \
+	 BYTE_BUF_GPT (b) : BYTE_BUF_BEG (b))
+#define BUF_FLOOR_OF_IGNORE_ACCESSIBLE(b, n)			\
+        (BUF_BEG (b) < BUF_GPT (b) && BUF_GPT (b) < (n) ?	\
+	 BUF_GPT (b) : BUF_BEG (b))
 
 /* Iterate over contiguous chunks of text in buffer BUF, starting at POS,
    of length LEN.  Evaluates POS and LEN only once, but BUF multiply.  In
@@ -1117,7 +1082,7 @@
    NOTE: This must be surrounded with braces! */
 
 #define BUFFER_TEXT_LOOP(buf, pos, len, runptr, runlen)			      \
-Ibyte *runptr;							      \
+Ibyte *runptr;								      \
 Bytecount runlen;							      \
 Bytebpos BTL_pos = (pos);						      \
 Bytebpos BTL_len = (len);						      \