Mercurial > hg > xemacs-beta

diff src/glyphs.c @ 1885:51ce4f55d8c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-01-27 13:33:18 by stephent] quiet GCC <87ad49o6vl.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Tue, 27 Jan 2004 13:33:21 +0000
parents 9d77c73d4103
children 04bc9d2f42c7
line wrap: on
line diff
--- a/src/glyphs.c	Tue Jan 27 13:23:53 2004 +0000
+++ b/src/glyphs.c	Tue Jan 27 13:33:21 2004 +0000
@@ -321,13 +321,13 @@
 	invalid_argument ("Invalid mapping form", mapping);
       else
 	{
-	  Lisp_Object exp = XCAR (mapping);
+	  Lisp_Object regexp = XCAR (mapping);
 	  Lisp_Object typevec = XCAR (XCDR (mapping));
 	  Lisp_Object pos = Qnil;
 	  Lisp_Object newvec;
 	  struct gcpro gcpro1;
 
-	  CHECK_STRING (exp);
+	  CHECK_STRING (regexp);
 	  CHECK_VECTOR (typevec);
 	  if (!NILP (XCDR (XCDR (mapping))))
 	    {
@@ -341,7 +341,7 @@
 
 	  newvec = Fcopy_sequence (typevec);
 	  if (INTP (pos))
-	    XVECTOR_DATA (newvec)[XINT (pos)] = exp;
+	    XVECTOR_DATA (newvec)[XINT (pos)] = regexp;
 	  GCPRO1 (newvec);
 	  image_validate (newvec);
 	  UNGCPRO;
@@ -377,7 +377,7 @@
   LIST_LOOP (tail, *get_image_conversion_list (console_type))
     {
       Lisp_Object mapping = XCAR (tail);
-      Lisp_Object exp = XCAR (mapping);
+      Lisp_Object regexp = XCAR (mapping);
       Lisp_Object typevec = XCAR (XCDR (mapping));
 
       /* if the result is of a type that can't be instantiated
@@ -388,7 +388,7 @@
 			   (INSTANTIATOR_TYPE (typevec), ERROR_ME),
 			   possible_dest_types, ())))
 	continue;
-      if (fast_string_match (exp, 0, data, 0, -1, 0, ERROR_ME, 0) >= 0)
+      if (fast_string_match (regexp, 0, data, 0, -1, 0, ERROR_ME, 0) >= 0)
 	{
 	  if (!NILP (XCDR (XCDR (mapping))))
 	    {