Mercurial > hg > xemacs-beta

diff src/chartab.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 2b6fa2618f76
children c925bacdda60
line wrap: on
line diff
--- a/src/chartab.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/chartab.c	Wed Jun 05 09:58:45 2002 +0000
@@ -691,13 +691,13 @@
 /* called from get_char_table(). */
 Lisp_Object
 get_non_ascii_char_table_value (Lisp_Char_Table *ct, int leading_byte,
-				Emchar c)
+				Ichar c)
 {
   Lisp_Object val;
   Lisp_Object charset = charset_by_leading_byte (leading_byte);
   int byte1, byte2;
 
-  BREAKUP_EMCHAR_1_UNSAFE (c, charset, byte1, byte2);
+  BREAKUP_ICHAR_1_UNSAFE (c, charset, byte1, byte2);
   val = ct->level1[leading_byte - MIN_LEADING_BYTE];
   if (CHAR_TABLE_ENTRYP (val))
     {
@@ -1026,7 +1026,7 @@
 	Lisp_Object charset;
 	int byte1, byte2;
 
-	BREAKUP_EMCHAR (range->ch, charset, byte1, byte2);
+	BREAKUP_ICHAR (range->ch, charset, byte1, byte2);
 	if (EQ (charset, Vcharset_ascii))
 	  ct->ascii[byte1] = val;
 	else if (EQ (charset, Vcharset_control_1))
@@ -1137,7 +1137,7 @@
 
   for (i = start, retval = 0; i <= stop && retval == 0; i++)
     {
-      rainj.ch = (Emchar) i;
+      rainj.ch = (Ichar) i;
       if (!UNBOUNDP (ct->ascii[i]))
 	retval = (fn) (&rainj, wrap_char_table (ct), ct->ascii[i], arg);
     }
@@ -1218,7 +1218,7 @@
 
       for (i = start, retval = 0; i <= stop && retval == 0; i++)
 	{
-	  rainj.ch = make_emchar (charset, row, i);
+	  rainj.ch = make_ichar (charset, row, i);
 	  if (!UNBOUNDP (cte->level2[i - 32]))
 	    retval = (fn) (&rainj, wrap_char_table (ct), cte->level2[i - 32],
 			   arg);
@@ -1266,7 +1266,7 @@
 
 	for (i = start, retval = 0; i <= stop && retval == 0; i++)
 	  {
-	    rainj.ch = make_emchar (charset, i, 0);
+	    rainj.ch = make_ichar (charset, i, 0);
 	    if (!UNBOUNDP (cte->level2[i - 32]))
 	      retval = (fn) (&rainj, wrap_char_table (ct), cte->level2[i - 32],
 			     arg);
@@ -1358,7 +1358,7 @@
 
     case CHARTAB_RANGE_CHAR:
       {
-	Emchar ch = range->ch;
+	Ichar ch = range->ch;
 	Lisp_Object val = get_char_table (ch, table);
 	struct chartab_range rainj;
 
@@ -1505,9 +1505,9 @@
         {
 	  if (CHAR_OR_CHAR_INTP (XCAR (range)))
 	    {
-	      Emchar first = XCHAR_OR_CHAR_INT (Fcar (range));
-	      Emchar last = XCHAR_OR_CHAR_INT (Fcar (Fcdr (range)));
-	      Emchar i;
+	      Ichar first = XCHAR_OR_CHAR_INT (Fcar (range));
+	      Ichar last = XCHAR_OR_CHAR_INT (Fcar (Fcdr (range)));
+	      Ichar i;
 
 	      for (i = first; i <= last; i++)
 		 Fput_char_table (make_char (i), val, chartab);
@@ -1571,7 +1571,7 @@
 }
 
 int
-check_category_char (Emchar ch, Lisp_Object table,
+check_category_char (Ichar ch, Lisp_Object table,
 		     int designator, int not_p)
 {
   REGISTER Lisp_Object temp;
@@ -1595,7 +1595,7 @@
        (position, designator, buffer, category_table))
 {
   Lisp_Object ctbl;
-  Emchar ch;
+  Ichar ch;
   int des;
   struct buffer *buf = decode_buffer (buffer, 0);
 
@@ -1615,7 +1615,7 @@
        (character, designator, category_table))
 {
   Lisp_Object ctbl;
-  Emchar ch;
+  Ichar ch;
   int des;
 
   CHECK_CATEGORY_DESIGNATOR (designator);
@@ -1706,7 +1706,7 @@
    directly.  */
 
 int
-word_boundary_p (Emchar c1, Emchar c2)
+word_boundary_p (Ichar c1, Ichar c2)
 {
   Lisp_Object category_set1, category_set2;
   Lisp_Object tail;
@@ -1719,7 +1719,7 @@
     c2 = cmpchar_component (c2, 0, 1);
 #endif
 
-  if (EQ (emchar_charset (c1), emchar_charset (c2)))
+  if (EQ (ichar_charset (c1), ichar_charset (c2)))
     {
       tail = Vword_separating_categories;
       default_result = 0;