[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/dialog-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/dialog-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -256,7 +256,7 @@
   /* !!#### do Japanese chars count as two? */
   int width =
     X_DLU_PER_CHAR *
-      intbyte_string_displayed_columns (XSTRING_DATA (text),
+      ibyte_string_displayed_columns (XSTRING_DATA (text),
 					XSTRING_LENGTH (text));
   return max (X_MIN_BUTTON, width);
 }
@@ -588,14 +588,14 @@
   
   /* Determine the final width layout */
   {
-    Intbyte *p = XSTRING_DATA (question);
+    Ibyte *p = XSTRING_DATA (question);
     Charcount string_max = 0, this_length = 0;
     while (1)
       {
-	Emchar ch = charptr_emchar (p);
-	INC_CHARPTR (p);
+	Ichar ch = itext_ichar (p);
+	INC_IBYTEPTR (p);
 	
-	if (ch == (Emchar)'\n' || ch == (Emchar)'\0')
+	if (ch == (Ichar)'\n' || ch == (Ichar)'\0')
 	  {
 	    string_max = max (this_length, string_max);
 	    this_length = 0;
@@ -603,7 +603,7 @@
 	else
 	  ++this_length;
 	
-	if (ch == (Emchar)'\0')
+	if (ch == (Ichar)'\0')
 	  break;
       }
     
@@ -618,17 +618,17 @@
   
   /* Now calculate the height for the text control */
   {
-    Intbyte *p = XSTRING_DATA (question);
+    Ibyte *p = XSTRING_DATA (question);
     Charcount break_at = text_width / X_DLU_PER_CHAR;
     Charcount char_pos = 0;
     int num_lines = 1;
-    Emchar ch;
+    Ichar ch;
     
-    while ((ch = charptr_emchar (p)) != (Emchar) '\0')
+    while ((ch = itext_ichar (p)) != (Ichar) '\0')
       {
-	INC_CHARPTR (p);
-	char_pos += ch != (Emchar) '\n';
-	if (ch == (Emchar) '\n' || char_pos == break_at)
+	INC_IBYTEPTR (p);
+	char_pos += ch != (Ichar) '\n';
+	if (ch == (Ichar) '\n' || char_pos == break_at)
 	  {
 	    ++num_lines;
 	    char_pos = 0;
@@ -721,7 +721,7 @@
 	
 	/* Next thing to add is control text, as Unicode string */
 	{
-	  Emchar accel_unused;
+	  Ichar accel_unused;
 	  
 	  push_lisp_string_as_unicode
 	    (template_,