diff src/glyphs.c @ 867:804517e16990

[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 79c6ff3eef26
line wrap: on
line diff
--- a/src/glyphs.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/glyphs.c	Wed Jun 05 09:58:45 2002 +0000
@@ -928,7 +928,7 @@
     case IMAGE_POINTER:
       if (STRINGP (IMAGE_INSTANCE_PIXMAP_FILENAME (ii)))
 	{
-	  Intbyte *s;
+	  Ibyte *s;
 	  Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii);
 	  s = qxestrrchr (XSTRING_DATA (filename), '/');
 	  if (s)
@@ -2127,19 +2127,19 @@
 /*                              error helpers                           */
 /************************************************************************/
 DOESNT_RETURN
-signal_image_error (const CIntbyte *reason, Lisp_Object frob)
+signal_image_error (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qimage_conversion_error, reason, frob);
 }
 
 DOESNT_RETURN
-signal_image_error_2 (const CIntbyte *reason, Lisp_Object frob0, Lisp_Object frob1)
+signal_image_error_2 (const CIbyte *reason, Lisp_Object frob0, Lisp_Object frob1)
 {
   signal_error_2 (Qimage_conversion_error, reason, frob0, frob1);
 }
 
 DOESNT_RETURN
-signal_double_image_error (const CIntbyte *string1, const CIntbyte *string2,
+signal_double_image_error (const CIbyte *string1, const CIbyte *string2,
 			   Lisp_Object data)
 {
   signal_error_1 (Qimage_conversion_error,
@@ -2149,7 +2149,7 @@
 }
 
 DOESNT_RETURN
-signal_double_image_error_2 (const CIntbyte *string1, const CIntbyte *string2,
+signal_double_image_error_2 (const CIbyte *string1, const CIbyte *string2,
 			     Lisp_Object data1, Lisp_Object data2)
 {
   signal_error_1 (Qimage_conversion_error,
@@ -2280,7 +2280,7 @@
   if (height)
     {
       /* Compute string metric info */
-      find_charsets_in_intbyte_string (charsets,
+      find_charsets_in_ibyte_string (charsets,
 				       XSTRING_DATA   (string),
 				       XSTRING_LENGTH (string));
 
@@ -2330,7 +2330,7 @@
   Lisp_Object frame = DOMAIN_FRAME (domain);
 
   /* Compute string font info */
-  find_charsets_in_intbyte_string (charsets,
+  find_charsets_in_ibyte_string (charsets,
 				   XSTRING_DATA   (string),
 				   XSTRING_LENGTH (string));
 
@@ -4849,7 +4849,7 @@
 }
 
 Lisp_Object
-display_table_entry (Emchar ch, Lisp_Object face_table,
+display_table_entry (Ichar ch, Lisp_Object face_table,
 		     Lisp_Object window_table)
 {
   Lisp_Object tail;