Mercurial > emacs
comparison src/casetab.c @ 18613:614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 04 Jul 1997 20:44:52 +0000 |
parents | 40ce43a92060 |
children | fa9ff387d260 |
comparison
equal
deleted
inserted
replaced
18612:88efccff8970 | 18613:614b916ff5bf |
---|---|
29 Lisp_Object Vascii_downcase_table, Vascii_upcase_table; | 29 Lisp_Object Vascii_downcase_table, Vascii_upcase_table; |
30 Lisp_Object Vascii_canon_table, Vascii_eqv_table; | 30 Lisp_Object Vascii_canon_table, Vascii_eqv_table; |
31 | 31 |
32 /* Used as a temporary in DOWNCASE and other macros in lisp.h. No | 32 /* Used as a temporary in DOWNCASE and other macros in lisp.h. No |
33 need to mark it, since it is used only very temporarily. */ | 33 need to mark it, since it is used only very temporarily. */ |
34 Lisp_Object case_temp1, case_temp2; | 34 int case_temp1; |
35 Lisp_Object case_temp2; | |
35 | 36 |
36 static void set_canon (); | 37 static void set_canon (); |
37 static void set_identity (); | 38 static void set_identity (); |
38 static void shuffle (); | 39 static void shuffle (); |
39 | 40 |
205 | 206 |
206 static void | 207 static void |
207 shuffle (table, c, elt) | 208 shuffle (table, c, elt) |
208 Lisp_Object table, c, elt; | 209 Lisp_Object table, c, elt; |
209 { | 210 { |
210 if (NATNUMP (elt) && c != elt) | 211 if (NATNUMP (elt) && !EQ (c, elt)) |
211 { | 212 { |
212 Lisp_Object tem = Faref (table, elt); | 213 Lisp_Object tem = Faref (table, elt); |
213 Faset (table, elt, c); | 214 Faset (table, elt, c); |
214 Faset (table, c, tem); | 215 Faset (table, c, tem); |
215 } | 216 } |