diff src/abbrev.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 e7ee5f8bde58
children ecf1ebac70d8
line wrap: on
line diff
--- a/src/abbrev.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/abbrev.c	Wed Jun 05 09:58:45 2002 +0000
@@ -115,7 +115,7 @@
      normally want to expand it.  OTOH, if the abbrev begins with
      non-word syntax (e.g. `#if'), it is OK to abbreviate it anywhere.  */
   if (abbrev_length < closure->maxlen && abbrev_length > 0
-      && (WORD_SYNTAX_P (closure->chartab, string_emchar (abbrev, 0)))
+      && (WORD_SYNTAX_P (closure->chartab, string_ichar (abbrev, 0)))
       && (WORD_SYNTAX_P (closure->chartab,
 			 BUF_FETCH_CHAR (closure->buf,
 					 closure->point -
@@ -125,7 +125,7 @@
     }
   /* Match abbreviation string against buffer text.  */
   {
-    Intbyte *ptr = XSTRING_DATA (abbrev);
+    Ibyte *ptr = XSTRING_DATA (abbrev);
     Charcount idx;
 
     for (idx = 0; idx < abbrev_length; idx++)
@@ -133,11 +133,11 @@
 	if (DOWNCASE (closure->buf,
 		      BUF_FETCH_CHAR (closure->buf,
 				      closure->point - abbrev_length + idx))
-	    != DOWNCASE (closure->buf, charptr_emchar (ptr)))
+	    != DOWNCASE (closure->buf, itext_ichar (ptr)))
 	  {
 	    break;
 	  }
-	INC_CHARPTR (ptr);
+	INC_IBYTEPTR (ptr);
       }
     if (idx == abbrev_length)
       {
@@ -183,7 +183,7 @@
 abbrev_oblookup (struct buffer *buf, Lisp_Object obarray)
 {
   Charbpos wordstart, wordend;
-  Intbyte *word, *p;
+  Ibyte *word, *p;
   Charbpos idx;
   Lisp_Object lookup;
 
@@ -231,13 +231,13 @@
   if (wordend <= wordstart)
     return 0;
 
-  p = word = (Intbyte *) ALLOCA (MAX_EMCHAR_LEN * (wordend - wordstart));
+  p = word = (Ibyte *) ALLOCA (MAX_ICHAR_LEN * (wordend - wordstart));
   for (idx = wordstart; idx < wordend; idx++)
     {
-      Emchar c = BUF_FETCH_CHAR (buf, idx);
+      Ichar c = BUF_FETCH_CHAR (buf, idx);
       if (UPPERCASEP (buf, c))
 	c = DOWNCASE (buf, c);
-      p += set_charptr_emchar (p, c);
+      p += set_itext_ichar (p, c);
     }
   lookup = oblookup (obarray, word, p - word);
   if (SYMBOLP (lookup) && !NILP (symbol_value (XSYMBOL (lookup))))
@@ -250,7 +250,7 @@
 static int
 obarray_has_blank_p (Lisp_Object obarray)
 {
-  return !ZEROP (oblookup (obarray, (Intbyte *)" ", 1));
+  return !ZEROP (oblookup (obarray, (Ibyte *)" ", 1));
 }
 
 /* Analyze case in the buffer substring, and report it.  */
@@ -261,7 +261,7 @@
   *lccount = *uccount = 0;
   while (length--)
     {
-      Emchar c = BUF_FETCH_CHAR (buf, pos);
+      Ichar c = BUF_FETCH_CHAR (buf, pos);
       if (UPPERCASEP (buf, c))
 	++*uccount;
       else if (LOWERCASEP (buf, c))