[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/indent.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/indent.c	Wed Jun 05 09:58:45 2002 +0000
@@ -132,7 +132,7 @@
   int tab_width = XINT (buf->tab_width);
   int post_tab;
   Charbpos pos = init_pos;
-  Emchar c;
+  Ichar c;
 
   if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
   col = tab_seen = post_tab = 0;
@@ -170,7 +170,7 @@
 		     + displayed_glyphs->end_columns));
 #else /* XEmacs */
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (emchar_charset (c));
+	  col += XCHARSET_COLUMNS (ichar_charset (c));
 #else
 	  col ++;
 #endif /* MULE */
@@ -202,7 +202,7 @@
   int tab_seen;
   int post_tab;
   Charbpos pos = init_pos;
-  Emchar c;
+  Ichar c;
 
   if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
   col = tab_seen = post_tab = 0;
@@ -213,7 +213,7 @@
 	break;
 
       pos--;
-      c = string_emchar (s, pos);
+      c = string_ichar (s, pos);
       if (c == '\t')
 	{
 	  if (tab_seen)
@@ -227,7 +227,7 @@
 	break;
       else
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (emchar_charset (c));
+	  col += XCHARSET_COLUMNS (ichar_charset (c));
 #else
 	  col ++;
 #endif /* MULE */
@@ -345,7 +345,7 @@
 {
   Bytebpos byte_end = BYTE_BUF_ZV (b);
   int col = 0;
-  Emchar c;
+  Ichar c;
   int tab_width = XINT (b->tab_width);
 
   if (tab_width <= 0 || tab_width > 1000)
@@ -410,7 +410,7 @@
   int tab_width = XINT (buf->tab_width);
 
   int prev_col = 0;
-  Emchar c = 0;
+  Ichar c = 0;
 
   buffer = wrap_buffer (buf);
   if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
@@ -457,7 +457,7 @@
 		     + displayed_glyphs->end_columns));
 #else /* XEmacs */
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (emchar_charset (c));
+	  col += XCHARSET_COLUMNS (ichar_charset (c));
 #else
 	  col ++;
 #endif /* MULE */