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

--- a/src/glyphs-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/glyphs-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -720,7 +720,7 @@
 
 struct color_symbol
 {
-  Intbyte *	name;
+  Ibyte *	name;
   COLORREF	color;
 };
 
@@ -899,7 +899,7 @@
       if (xpmimage.colorTable[i].c_color)
 	{
 	  colortbl[i]=
-	    mswindows_string_to_color ((Intbyte *)
+	    mswindows_string_to_color ((Ibyte *)
 				       xpmimage.colorTable[i].c_color);
 	  goto label_found_color;
 	}
@@ -1094,7 +1094,7 @@
 
 typedef struct
 {
-  CIntbyte *name;
+  CIbyte *name;
   int	resource_id;
 } resource_t;
 
@@ -1175,7 +1175,7 @@
 
   do
     {
-      if (!qxestrcasecmp_i18n ((Intbyte *) res->name, XSTRING_DATA (name)))
+      if (!qxestrcasecmp_i18n ((Ibyte *) res->name, XSTRING_DATA (name)))
 	return res->resource_id;
     }
   while ((++res)->name);
@@ -1637,7 +1637,7 @@
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
   int i, stattis;
   UChar_Binary *p, *bits, *bp;
-  const CIntbyte * volatile emsg = 0;
+  const CIbyte * volatile emsg = 0;
   const UChar_Binary * volatile dstring;
 
   assert (!NILP (data));
@@ -1803,16 +1803,16 @@
 charset_of_text (Lisp_Object text)
 {
 #ifdef MULE
-  Intbyte *p;
+  Ibyte *p;
 
   if (NILP (text))
     return Vcharset_ascii;
   for (p = XSTRING_DATA (text); *p;)
     {
-      Emchar c = charptr_emchar (p);
-      if (!EQ (emchar_charset (c), Vcharset_ascii))
-	return emchar_charset (c);
-      INC_CHARPTR (p);
+      Ichar c = itext_ichar (p);
+      if (!EQ (ichar_charset (c), Vcharset_ascii))
+	return ichar_charset (c);
+      INC_IBYTEPTR (p);
     }
 #endif /* MULE */
 
@@ -2213,7 +2213,7 @@
 			      Lisp_Object instantiator,
 			      Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 			      int dest_mask, Lisp_Object domain,
-			      const CIntbyte *class, int flags, int exflags)
+			      const CIbyte *class, int flags, int exflags)
 {
   /* this function can call lisp */
   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);