[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/console-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -48,21 +48,21 @@
 split_up_display_spec (Lisp_Object display, int *hostname_length,
 		       int *display_length, int *screen_length)
 {
-  Intbyte *beg = XSTRING_DATA (display);
-  Intbyte *end = beg + XSTRING_LENGTH (display);
-  Intbyte *p = end;
+  Ibyte *beg = XSTRING_DATA (display);
+  Ibyte *end = beg + XSTRING_LENGTH (display);
+  Ibyte *p = end;
 
   while (p > beg)
     {
-      DEC_CHARPTR (p);
-      if (charptr_emchar (p) == ':')
+      DEC_IBYTEPTR (p);
+      if (itext_ichar (p) == ':')
 	{
 	  *hostname_length = p - beg;
 
 	  while (p < end - 1)
 	    {
-	      INC_CHARPTR (p);
-	      if (charptr_emchar (p) == '.')
+	      INC_IBYTEPTR (p);
+	      if (itext_ichar (p) == '.')
 		{
 		  *display_length = p - beg - *hostname_length;
 		  *screen_length = end - p;
@@ -193,20 +193,20 @@
   connection = x_device_to_console_connection (connection, errb);
 
   /* Check for a couple of standard special cases */
-  if (string_emchar (connection, 0) == ':')
+  if (string_ichar (connection, 0) == ':')
     connection = concat2 (build_string ("localhost"), connection);
   else
     {
       /* connection =~ s/^unix:/localhost:/; */
-      const Intbyte *p   = XSTRING_DATA (connection);
-      const Intbyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection);
+      const Ibyte *p   = XSTRING_DATA (connection);
+      const Ibyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection);
       int i;
 
       for (i = 0; i < (int) sizeof ("unix:") - 1; i++)
 	{
-	  if (p == end || charptr_emchar (p) != "unix:"[i])
+	  if (p == end || itext_ichar (p) != "unix:"[i])
 	    goto ok;
-	  INC_CHARPTR (p);
+	  INC_IBYTEPTR (p);
 	}
 
       connection = concat2 (build_string ("localhost:"),