CVS update by aidan xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/02/06 21:01:44

  Modified:    xemacs/src ChangeLog specifier.c
Log:
Fix a problem with specifiers I introduced.

Revision  Changes    Path
1.1043    +7 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1042
retrieving revision 1.1043
diff -u -p -r1.1042 -r1.1043
--- ChangeLog	2007/02/06 19:36:46	1.1042
+++ ChangeLog	2007/02/06 20:01:40	1.1043
@@ -1,5 +1,12 @@
 2007-02-06  Aidan Kehoe  <kehoea at parhasard.net>
 
+	* specifier.c (setup_device_initial_specifier_tags):
+	Fix a bug where the mswindows specifier tag was matching X11
+	devices, because the format of the DEVICE_USER_SPECIFIED_TAGS list
+	wasn't being respected correctly. 
+
+2007-02-06  Aidan Kehoe  <kehoea at parhasard.net>
+
 	* mule-charset.c (complex_vars_of_mule_charset):
 	iso8859-2 is not the X11 charset registry for the iso8859-4
 	charset, my mistake. 



1.52      +2 -3      XEmacs/xemacs/src/specifier.c

Index: specifier.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- specifier.c	2006/12/11 12:22:52	1.51
+++ specifier.c	2007/02/06 20:01:42	1.52
@@ -1310,18 +1310,17 @@ setup_device_initial_specifier_tags (str
       assert(3 == list_len);
 
       device_predicate = XCADR(XCAR (rest));
-      charset_predicate = XCADDR(XCAR (rest));
 					   
       if (NILP (device_predicate))
 	{
-	  XCDR (XCAR (rest2)) = list2(Qt, charset_predicate);
+	  XCDR (XCAR (rest2)) = Qt; 
 	}
       else
 	{
 	  device_predicate = !NILP (call_critical_lisp_code 
 				    (d, device_predicate, device)) 
 	    ? Qt : Qnil;
-	  XCDR (XCAR (rest2)) = list2(device_predicate, charset_predicate);
+	  XCDR (XCAR (rest2)) = device_predicate;
 	}
     }
 }