(wait_reading_process_input, both versions):

[gnu-emacs] / src / casetab.c

diff --git a/src/casetab.c b/src/casetab.c
index 29a237cb94837a78229c29003960edca08ec5c73..6056af54682d61d1ff56eb5be8580e4d680941b8 100644 (file)
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -31,16 +31,17 @@ Lisp_Object Vascii_canon_table, Vascii_eqv_table;
 
 /* Used as a temporary in DOWNCASE and other macros in lisp.h.  No
    need to mark it, since it is used only very temporarily.  */
-Lisp_Object case_temp1, case_temp2;
+int case_temp1;
+Lisp_Object case_temp2;
 
 static void set_canon ();
 static void set_identity ();
 static void shuffle ();
 
 DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0,
-  "Return t iff OBJECT is a case table.\n\
-See `set-case-table' for more information on these data structures.")
-  (object)
+       doc: /* Return t iff OBJECT is a case table.
+See `set-case-table' for more information on these data structures.  */)
+     (object)
      Lisp_Object object;
 {
   Lisp_Object up, canon, eqv;
@@ -73,16 +74,16 @@ check_case_table (obj)
 }   
 
 DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0,
-  "Return the case table of the current buffer.")
-  ()
+       doc: /* Return the case table of the current buffer.  */)
+     ()
 {
   return current_buffer->downcase_table;
 }
 
 DEFUN ("standard-case-table", Fstandard_case_table, Sstandard_case_table, 0, 0, 0,
-  "Return the standard case table.\n\
-This is the one used for new buffers.")
-  ()
+       doc: /* Return the standard case table.
+This is the one used for new buffers.  */)
+     ()
 {
   return Vascii_downcase_table;
 }
@@ -90,31 +91,31 @@ This is the one used for new buffers.")
 static Lisp_Object set_case_table ();
 
 DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0,
-  "Select a new case table for the current buffer.\n\
-A case table is a char-table which maps characters\n\
-to their lower-case equivalents.  It also has three \"extra\" slots\n\
-which may be additional char-tables or nil.\n\
-These slots are called UPCASE, CANONICALIZE and EQUIVALENCES.\n\
-UPCASE maps each character to its upper-case equivalent;\n\
- if lower and upper case characters are in 1-1 correspondence,\n\
- you may use nil and the upcase table will be deduced from DOWNCASE.\n\
-CANONICALIZE maps each character to a canonical equivalent;\n\
- any two characters that are related by case-conversion have the same\n\
- canonical equivalent character; it may be nil, in which case it is\n\
- deduced from DOWNCASE and UPCASE.\n\
-EQUIVALENCES is a map that cyclicly permutes each equivalence class\n\
- (of characters with the same canonical equivalent); it may be nil,\n\
- in which case it is deduced from CANONICALIZE.")
-  (table)
+       doc: /* Select a new case table for the current buffer.
+A case table is a char-table which maps characters
+to their lower-case equivalents.  It also has three \"extra\" slots
+which may be additional char-tables or nil.
+These slots are called UPCASE, CANONICALIZE and EQUIVALENCES.
+UPCASE maps each character to its upper-case equivalent;
+ if lower and upper case characters are in 1-1 correspondence,
+ you may use nil and the upcase table will be deduced from DOWNCASE.
+CANONICALIZE maps each character to a canonical equivalent;
+ any two characters that are related by case-conversion have the same
+ canonical equivalent character; it may be nil, in which case it is
+ deduced from DOWNCASE and UPCASE.
+EQUIVALENCES is a map that cyclicly permutes each equivalence class
+ (of characters with the same canonical equivalent); it may be nil,
+ in which case it is deduced from CANONICALIZE.  */)
+     (table)
      Lisp_Object table;
 {
   return set_case_table (table, 0);
 }
 
 DEFUN ("set-standard-case-table", Fset_standard_case_table, Sset_standard_case_table, 1, 1, 0,
-  "Select a new standard case table for new buffers.\n\
-See `set-case-table' for more info on case tables.")
-  (table)
+       doc: /* Select a new standard case table for new buffers.
+See `set-case-table' for more info on case tables.  */)
+     (table)
      Lisp_Object table;
 {
   return set_case_table (table, 1);
@@ -157,6 +158,9 @@ set_case_table (table, standard)
       XCHAR_TABLE (table)->extras[2] = eqv;
     }
 
+  /* This is so set_image_of_range_1 in regex.c can find the EQV table.  */
+  XCHAR_TABLE (canon)->extras[2] = eqv;
+
   if (standard)
     Vascii_downcase_table = table;
   else
@@ -207,7 +211,7 @@ static void
 shuffle (table, c, elt)
      Lisp_Object table, c, elt;
 {
-  if (NATNUMP (elt) && c != elt)
+  if (NATNUMP (elt) && !EQ (c, elt))
     {
       Lisp_Object tem = Faref (table, elt);
       Faset (table, elt, c);
@@ -215,6 +219,7 @@ shuffle (table, c, elt)
     }
 }
 \f
+void
 init_casetab_once ()
 {
   register int i;
@@ -255,6 +260,7 @@ init_casetab_once ()
   XCHAR_TABLE (down)->extras[2] = Fcopy_sequence (up);
 }
 
+void
 syms_of_casetab ()
 {
   Qcase_table_p = intern ("case-table-p");