Mercurial > hg > xemacs-beta

diff src/insdel.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 2b6fa2618f76
children 1b0339b048ce
line wrap: on
line diff
--- a/src/insdel.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/insdel.c	Wed Jun 05 09:58:45 2002 +0000
@@ -259,7 +259,7 @@
 static void
 gap_left (struct buffer *buf, Bytebpos pos)
 {
-  Intbyte *to, *from;
+  Ibyte *to, *from;
   Bytecount i;
   Bytebpos new_s1;
   struct buffer *mbuf;
@@ -330,7 +330,7 @@
 static void
 gap_right (struct buffer *buf, Bytebpos pos)
 {
-  Intbyte *to, *from;
+  Ibyte *to, *from;
   Bytecount i;
   Bytebpos new_s1;
   struct buffer *mbuf;
@@ -469,7 +469,7 @@
 static void
 make_gap (struct buffer *buf, Bytecount increment)
 {
-  Intbyte *result;
+  Ibyte *result;
   Lisp_Object tem;
   Bytebpos real_gap_loc;
   Bytecount old_gap_size;
@@ -1005,7 +1005,7 @@
 /************************************************************************/
 
 void
-fixup_internal_substring (const Intbyte *nonreloc, Lisp_Object reloc,
+fixup_internal_substring (const Ibyte *nonreloc, Lisp_Object reloc,
 			  Bytecount offset, Bytecount *len)
 {
   assert ((nonreloc && NILP (reloc)) || (!nonreloc && STRINGP (reloc)));
@@ -1047,7 +1047,7 @@
 
 Charcount
 buffer_insert_string_1 (struct buffer *buf, Charbpos pos,
-			const Intbyte *nonreloc, Lisp_Object reloc,
+			const Ibyte *nonreloc, Lisp_Object reloc,
 			Bytecount offset, Bytecount length,
 			int flags)
 {
@@ -1181,19 +1181,19 @@
   /* Update our count of ASCII, 8-bit and 16-bit chars and the
      entirely-one-byte flag */
   {
-    const Intbyte *ptr = nonreloc + offset;
-    const Intbyte *ptrend = ptr + length;
+    const Ibyte *ptr = nonreloc + offset;
+    const Ibyte *ptrend = ptr + length;
 
     while (ptr < ptrend)
       {
-	Emchar ch = charptr_emchar (ptr);
-	if (emchar_ascii_p (ch))
+	Ichar ch = itext_ichar (ptr);
+	if (ichar_ascii_p (ch))
 	  buf->text->num_ascii_chars++;
-	if (emchar_8_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_8_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_8_bit_fixed_chars++;
-	if (emchar_16_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_16_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_16_bit_fixed_chars++;
-	INC_CHARPTR (ptr);
+	INC_IBYTEPTR (ptr);
       }
     
     buf->text->entirely_one_byte_p =
@@ -1268,7 +1268,7 @@
 
 Charcount
 buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos,
-			    const Intbyte *nonreloc, Bytecount length,
+			    const Ibyte *nonreloc, Bytecount length,
 			    int flags)
 {
   /* This function can GC */
@@ -1294,17 +1294,17 @@
 {
   /* This function can GC */
   const char *translated = GETTEXT (s);
-  return buffer_insert_string_1 (buf, pos, (const Intbyte *) translated, Qnil,
+  return buffer_insert_string_1 (buf, pos, (const Ibyte *) translated, Qnil,
 				 0, strlen (translated), flags);
 }
 
 Charcount
-buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, Emchar ch,
+buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, Ichar ch,
 			    int flags)
 {
   /* This function can GC */
-  Intbyte str[MAX_EMCHAR_LEN];
-  Bytecount len = set_charptr_emchar (str, ch);
+  Ibyte str[MAX_ICHAR_LEN];
+  Bytecount len = set_itext_ichar (str, ch);
   return buffer_insert_string_1 (buf, pos, str, Qnil, 0, len, flags);
 }
 
@@ -1313,7 +1313,7 @@
 			int flags)
 {
   /* This function can GC */
-  return buffer_insert_emacs_char_1 (buf, pos, (Emchar) (unsigned char) c,
+  return buffer_insert_emacs_char_1 (buf, pos, (Ichar) (unsigned char) c,
 				     flags);
 }
 
@@ -1437,12 +1437,12 @@
 
     for (i = byte_from; i < byte_to; i = next_bytebpos (buf, i))
       {
-	Emchar ch = BYTE_BUF_FETCH_CHAR (buf, i);
-	if (emchar_ascii_p (ch))
+	Ichar ch = BYTE_BUF_FETCH_CHAR (buf, i);
+	if (ichar_ascii_p (ch))
 	  buf->text->num_ascii_chars--;
-	if (emchar_8_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_8_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_8_bit_fixed_chars--;
-	if (emchar_16_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_16_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_16_bit_fixed_chars--;
       }
   }
@@ -1548,24 +1548,24 @@
 /* Replace the character at POS in buffer B with CH. */
 
 void
-buffer_replace_char (struct buffer *buf, Charbpos pos, Emchar ch,
+buffer_replace_char (struct buffer *buf, Charbpos pos, Ichar ch,
 		     int not_real_change, int force_lock_check)
 {
   /* This function can GC */
-  Intbyte newstr[MAX_EMCHAR_LEN];
+  Ibyte newstr[MAX_ICHAR_LEN];
   Bytecount newlen;
-  Emchar oldch;
+  Ichar oldch;
 
   /* Defensive steps just in case a buffer gets deleted and a calling
      function doesn't notice it. */
   if (!BUFFER_LIVE_P (buf))
     return;
 
-  newlen = set_charptr_emchar_fmt (newstr, ch, BUF_FORMAT (buf),
+  newlen = set_itext_ichar_fmt (newstr, ch, BUF_FORMAT (buf),
 				   wrap_buffer (buf));
   oldch = BUF_FETCH_CHAR (buf, pos);
-  if (emchar_fits_in_format (ch, BUF_FORMAT (buf), wrap_buffer (buf)) &&
-      newlen == emchar_len_fmt (oldch, BUF_FORMAT (buf)))
+  if (ichar_fits_in_format (ch, BUF_FORMAT (buf), wrap_buffer (buf)) &&
+      newlen == ichar_len_fmt (oldch, BUF_FORMAT (buf)))
     {
       struct buffer *mbuf;
       Lisp_Object bufcons;
@@ -1606,17 +1606,17 @@
 	}
 
 #ifdef MULE
-      if (emchar_ascii_p (oldch))
+      if (ichar_ascii_p (oldch))
 	buf->text->num_ascii_chars--;
-      if (emchar_8_bit_fixed_p (oldch, wrap_buffer (buf)))
+      if (ichar_8_bit_fixed_p (oldch, wrap_buffer (buf)))
 	buf->text->num_8_bit_fixed_chars--;
-      if (emchar_16_bit_fixed_p (oldch, wrap_buffer (buf)))
+      if (ichar_16_bit_fixed_p (oldch, wrap_buffer (buf)))
 	buf->text->num_16_bit_fixed_chars--;
-      if (emchar_ascii_p (ch))
+      if (ichar_ascii_p (ch))
 	buf->text->num_ascii_chars++;
-      if (emchar_8_bit_fixed_p (ch, wrap_buffer (buf)))
+      if (ichar_8_bit_fixed_p (ch, wrap_buffer (buf)))
 	buf->text->num_8_bit_fixed_chars++;
-      if (emchar_16_bit_fixed_p (ch, wrap_buffer (buf)))
+      if (ichar_16_bit_fixed_p (ch, wrap_buffer (buf)))
 	buf->text->num_16_bit_fixed_chars++;
 #endif /* MULE */