[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/casefiddle.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/casefiddle.c	Wed Jun 05 09:58:45 2002 +0000
@@ -40,7 +40,7 @@
 
   if (CHAR_OR_CHAR_INTP (string_or_char))
     {
-      Emchar c;
+      Ichar c;
       CHECK_CHAR_COERCE_INT (string_or_char);
       c = XCHAR (string_or_char);
       c = (flag == CASE_DOWN) ? DOWNCASE (buf, c) : UPCASE (buf, c);
@@ -50,17 +50,17 @@
   if (STRINGP (string_or_char))
     {
       Lisp_Object syntax_table = buf->mirror_syntax_table;
-      Intbyte *storage =
-	alloca_array (Intbyte, XSTRING_LENGTH (string_or_char) *
-		      MAX_EMCHAR_LEN);
-      Intbyte *newp = storage;
-      Intbyte *oldp = XSTRING_DATA (string_or_char);
-      Intbyte *endp = oldp + XSTRING_LENGTH (string_or_char);
+      Ibyte *storage =
+	alloca_array (Ibyte, XSTRING_LENGTH (string_or_char) *
+		      MAX_ICHAR_LEN);
+      Ibyte *newp = storage;
+      Ibyte *oldp = XSTRING_DATA (string_or_char);
+      Ibyte *endp = oldp + XSTRING_LENGTH (string_or_char);
       int wordp = 0, wordp_prev;
 
       while (oldp < endp)
 	{
-	  Emchar c = charptr_emchar (oldp);
+	  Ichar c = itext_ichar (oldp);
 	  switch (flag)
 	    {
 	    case CASE_UP:
@@ -84,8 +84,8 @@
 	      break;
 	    }
 
-	  newp += set_charptr_emchar (newp, c);
-	  INC_CHARPTR (oldp);
+	  newp += set_itext_ichar (newp, c);
+	  INC_IBYTEPTR (oldp);
 	}
 
       return make_string (storage, newp - storage);
@@ -173,8 +173,8 @@
 
   for (pos = s; pos < e; pos++)
     {
-      Emchar oldc = BUF_FETCH_CHAR (buf, pos);
-      Emchar c = oldc;
+      Ichar oldc = BUF_FETCH_CHAR (buf, pos);
+      Ichar c = oldc;
 
       switch (flag)
 	{