[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/event-stream.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/event-stream.c	Wed Jun 05 09:58:45 2002 +0000
@@ -372,7 +372,7 @@
     {
       /* #### This badly needs to be turned into a Dynarr */
       builder->echo_buf_length = 300; /* #### Kludge */
-      builder->echo_buf = xnew_array (Intbyte, builder->echo_buf_length);
+      builder->echo_buf = xnew_array (Ibyte, builder->echo_buf_length);
       builder->echo_buf[0] = 0;
     }
   else
@@ -752,7 +752,7 @@
   /* This function can GC */
   DECLARE_EISTRING_MALLOC (buf);
   Bytecount buf_index = command_builder->echo_buf_index;
-  Intbyte *e;
+  Ibyte *e;
   Bytecount len;
 
   if (buf_index < 0)
@@ -859,7 +859,7 @@
 static void
 maybe_kbd_translate (Lisp_Object event)
 {
-  Emchar c;
+  Ichar c;
   int did_translate = 0;
 
   if (XEVENT_TYPE (event) != key_press_event)
@@ -3343,7 +3343,7 @@
     {
       Lisp_Object terminal = builder->most_current_event;
       struct key_data *key = &XEVENT (terminal)->event.key;
-      Emchar c = 0;
+      Ichar c = 0;
       if ((key->modifiers & XEMACS_MOD_SHIFT)
           || (CHAR_OR_CHAR_INTP (key->keysym)
               && ((c = XCHAR_OR_CHAR_INT (key->keysym)),
@@ -3432,7 +3432,7 @@
     {
       Lisp_Object keysym =
 	XEVENT (builder->most_current_event)->event.key.keysym;
-      if (CHARP (keysym) && !emchar_ascii_p (XCHAR (keysym)))
+      if (CHARP (keysym) && !ichar_ascii_p (XCHAR (keysym)))
         return Vcomposed_character_default_binding;
     }
 #endif
@@ -3902,7 +3902,7 @@
 
 		if (len + buf_index + 1 <= command_builder->echo_buf_length)
 		  {
-		    Intbyte *echo = command_builder->echo_buf + buf_index;
+		    Ibyte *echo = command_builder->echo_buf + buf_index;
 		    memcpy (echo, XSTRING_DATA (prompt), len);
 		    echo[len] = 0;
 		  }
@@ -4616,9 +4616,9 @@
       Lisp_Object keysym = XEVENT (event)->event.key.keysym;
       if (CHARP (XEVENT (event)->event.key.keysym))
 	{
-	  Emchar ch = XCHAR (keysym);
-	  Intbyte str[MAX_EMCHAR_LEN];
-	  Bytecount len = set_charptr_emchar (str, ch);
+	  Ichar ch = XCHAR (keysym);
+	  Ibyte str[MAX_ICHAR_LEN];
+	  Bytecount len = set_itext_ichar (str, ch);
 	  Lstream_write (XLSTREAM (Vdribble_file), str, len);
 	}
       else if (string_char_length (XSYMBOL (keysym)->name) == 1)