diff src/text.c @ 800:a5954632b187

[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 2b676dc88c66
line wrap: on
line diff
--- a/src/text.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/text.c	Sun Mar 31 08:30:17 2002 +0000
@@ -1274,7 +1274,7 @@
      we will get no farther than here.
 
      This also catches len < 0. */
-  charbpos_checking_assert (ptr == end);
+  text_checking_assert (ptr == end);
 
   return count;
 }
@@ -1287,7 +1287,7 @@
 {
   const Intbyte *newptr = ptr;
 
-  charbpos_checking_assert (len >= 0);
+  text_checking_assert (len >= 0);
   while (len > 0)
     {
       INC_CHARPTR (newptr);
@@ -1405,7 +1405,7 @@
 	  size = 1;
 	}
     }
-#ifdef ERROR_CHECK_CHARBPOS
+#ifdef ERROR_CHECK_TEXT
   else if (x >= bufmin)
     abort ();
 #endif
@@ -1683,7 +1683,7 @@
 	  size = 1;
 	}
     }
-#ifdef ERROR_CHECK_CHARBPOS
+#ifdef ERROR_CHECK_TEXT
   else if (x >= bytmin)
     abort ();
 #endif
@@ -2031,7 +2031,7 @@
 
 #endif /* MULE */
 
-#ifdef ERROR_CHECK_CHARBPOS
+#ifdef ERROR_CHECK_TEXT
 
 Bytebpos
 charbpos_to_bytebpos (struct buffer *buf, Charbpos x)
@@ -2048,7 +2048,7 @@
   return real_bytebpos_to_charbpos (buf, x);
 }
 
-#endif /* ERROR_CHECK_CHARBPOS */
+#endif /* ERROR_CHECK_TEXT */
 
 
 /************************************************************************/
@@ -2522,7 +2522,7 @@
 	    Dynarr_add (conversion_out_dynarr, (Extbyte) c);
 	    INC_CHARPTR (ptr);
 	  }
-	charbpos_checking_assert (ptr == end);
+	text_checking_assert (ptr == end);
       }
 #else
       Dynarr_add_many (conversion_out_dynarr, ptr, len);
@@ -2600,7 +2600,8 @@
 	}
 
       streams_to_delete[delete_count++] = outstream =
-	make_coding_output_stream (XLSTREAM (outstream), coding_system, CODING_ENCODE);
+	make_coding_output_stream (XLSTREAM (outstream), coding_system,
+				   CODING_ENCODE, 0);
 
       reader = XLSTREAM (instream);
       writer = XLSTREAM (outstream);
@@ -2784,7 +2785,8 @@
 	}
 
       streams_to_delete[delete_count++] = outstream =
-	make_coding_output_stream (XLSTREAM (outstream), coding_system, CODING_DECODE);
+	make_coding_output_stream (XLSTREAM (outstream), coding_system,
+				   CODING_DECODE, 0);
 
       reader = XLSTREAM (instream);
       writer = XLSTREAM (outstream);
@@ -3015,7 +3017,7 @@
   for (bytes = REP_BYTES_BY_FIRST_BYTE (ch) - 1; bytes; bytes--)
     {
       int c = Lstream_getc (stream);
-      charbpos_checking_assert (c >= 0);
+      text_checking_assert (c >= 0);
       *++strptr = (Intbyte) c;
     }
   return charptr_emchar (str);