CVS update by aidan xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 06/12/11 13:22:56

  Modified:    xemacs/src ChangeLog specifier.c
Log:
2006-12-08  Aidan Kehoe  <kehoea at parhasard.net>

	* specifier.c (charset_matches_specifier_tag_set_p):
	A charset's entry in Vcharset_tag_lists may be nil, if, when that
	charset was created, no tags with associated charset predicates
	existed. Accept this possibility, treat it as the tag not matching
	that charset.

Revision  Changes    Path
1.1033    +8 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1032
retrieving revision 1.1033
diff -u -p -r1.1032 -r1.1033
--- ChangeLog	2006/12/11 10:10:18	1.1032
+++ ChangeLog	2006/12/11 12:22:47	1.1033
@@ -1,3 +1,11 @@
+2006-12-08  Aidan Kehoe  <kehoea at parhasard.net> 
+ 
+	* specifier.c (charset_matches_specifier_tag_set_p): 
+	A charset's entry in Vcharset_tag_lists may be nil, if, when that 
+	charset was created, no tags with associated charset predicates 
+	existed. Accept this possibility, treat it as the tag not matching 
+	that charset.  
+
 2006-12-11  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* event-tty.c: 



1.51      +10 -6     XEmacs/xemacs/src/specifier.c

Index: specifier.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- specifier.c	2006/11/15 21:12:17	1.50
+++ specifier.c	2006/12/11 12:22:52	1.51
@@ -997,12 +997,16 @@ charset_matches_specifier_tag_set_p (Lis
       Lisp_Object tag = XCAR (rest);
       Lisp_Object assoc;
 
-      /* This function will not ever be called with a charset for which the
-	 relevant information hasn't been calculated (the information is
-	 calculated with the creation of every charset).  */
-      assert (!NILP(XVECTOR_DATA
-		    (Vcharset_tag_lists)[XCHARSET_LEADING_BYTE(charset) 
-					 - MIN_LEADING_BYTE]));
+      /* In the event that, during the creation of a charset, no specifier
+         tags exist for which CHARSET-PREDICATE has been specified, then
+         that charset's entry in Vcharset_tag_lists will be nil, and this
+         charset shouldn't match. */
+
+      if (NILP (XVECTOR_DATA(Vcharset_tag_lists)[XCHARSET_LEADING_BYTE(charset) 
+                                                 - MIN_LEADING_BYTE]))
+        {
+          return 0;
+        }
 
       /* Now, find out what the pre-calculated value is. */
       assoc = assq_no_quit(tag,