Mercurial > hg > xemacs-beta

diff src/minibuf.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 79c6ff3eef26
line wrap: on
line diff
--- a/src/minibuf.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/minibuf.c	Wed Jun 05 09:58:45 2002 +0000
@@ -206,7 +206,7 @@
    if IGNORE_CASE is true. */
 
 Charcount
-scmp_1 (const Intbyte *s1, const Intbyte *s2, Charcount len,
+scmp_1 (const Ibyte *s1, const Ibyte *s2, Charcount len,
 	int ignore_case)
 {
   Charcount l = len;
@@ -215,14 +215,14 @@
     {
       while (l)
         {
-          Emchar c1 = DOWNCASE (0, charptr_emchar (s1));
-          Emchar c2 = DOWNCASE (0, charptr_emchar (s2));
+          Ichar c1 = DOWNCASE (0, itext_ichar (s1));
+          Ichar c2 = DOWNCASE (0, itext_ichar (s2));
 
           if (c1 == c2)
             {
               l--;
-              INC_CHARPTR (s1);
-              INC_CHARPTR (s2);
+              INC_IBYTEPTR (s1);
+              INC_IBYTEPTR (s2);
             }
           else
             break;
@@ -230,11 +230,11 @@
     }
   else
     {
-      while (l && charptr_emchar (s1) == charptr_emchar (s2))
+      while (l && itext_ichar (s1) == itext_ichar (s2))
 	{
 	  l--;
-	  INC_CHARPTR (s1);
-	  INC_CHARPTR (s2);
+	  INC_IBYTEPTR (s1);
+	  INC_IBYTEPTR (s2);
 	}
     }
 
@@ -245,7 +245,7 @@
 
 
 int
-regexp_ignore_completion_p (const Intbyte *nonreloc,
+regexp_ignore_completion_p (const Ibyte *nonreloc,
 			    Lisp_Object reloc, Bytecount offset,
 			    Bytecount length)
 {
@@ -622,8 +622,8 @@
           /* Reject alternatives that start with space
 	     unless the input starts with space.  */
 	  && ((string_char_length (string) > 0 &&
-	       string_emchar (string, 0) == ' ')
-	      || string_emchar (eltstring, 0) != ' ')
+	       string_ichar (string, 0) == ' ')
+	      || string_ichar (eltstring, 0) != ' ')
 	  && (0 > scmp (XSTRING_DATA (eltstring),
                         XSTRING_DATA (string),
                         slength)))
@@ -708,7 +708,7 @@
 }
 
 void
-echo_area_append (struct frame *f, const Intbyte *nonreloc, Lisp_Object reloc,
+echo_area_append (struct frame *f, const Ibyte *nonreloc, Lisp_Object reloc,
 		  Bytecount offset, Bytecount length,
 		  Lisp_Object label)
 {
@@ -761,7 +761,7 @@
 }
 
 void
-echo_area_message (struct frame *f, const Intbyte *nonreloc,
+echo_area_message (struct frame *f, const Ibyte *nonreloc,
 		   Lisp_Object reloc, Bytecount offset, Bytecount length,
 		   Lisp_Object label)
 {
@@ -805,7 +805,7 @@
 /* Dump an informative message to the echo area.  This function takes a
    string in internal format. */
 void
-message_internal (const Intbyte *nonreloc, Lisp_Object reloc,
+message_internal (const Ibyte *nonreloc, Lisp_Object reloc,
 		  Bytecount offset, Bytecount length)
 {
   /* This function can call lisp  */
@@ -815,7 +815,7 @@
 }
 
 void
-message_append_internal (const Intbyte *nonreloc, Lisp_Object reloc,
+message_append_internal (const Ibyte *nonreloc, Lisp_Object reloc,
 			 Bytecount offset, Bytecount length)
 {
   /* This function can call lisp  */
@@ -829,7 +829,7 @@
    on the format string; message_no_translate() does not. */
 
 static void
-message_1 (const CIntbyte *fmt, va_list args)
+message_1 (const CIbyte *fmt, va_list args)
 {
   /* This function can call lisp */
   if (fmt)
@@ -847,7 +847,7 @@
 }
 
 static void
-message_append_1 (const CIntbyte *fmt, va_list args)
+message_append_1 (const CIbyte *fmt, va_list args)
 {
   /* This function can call lisp */
   if (fmt)