Mercurial > hg > xemacs-beta
changeset 3817:caceb9db5b0a
[xemacs-hg @ 2007-02-06 20:01:40 by aidan]
Fix a problem with specifiers I introduced.
| author | aidan |
|---|---|
| date | Tue, 06 Feb 2007 20:01:42 +0000 |
| parents | bd7108edc555 |
| children | ace4cd43edaa |
| files | src/ChangeLog src/specifier.c |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Feb 06 19:36:51 2007 +0000 +++ b/src/ChangeLog Tue Feb 06 20:01:42 2007 +0000 @@ -1,3 +1,10 @@ +2007-02-06 Aidan Kehoe <kehoea@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@parhasard.net> * mule-charset.c (complex_vars_of_mule_charset):
--- a/src/specifier.c Tue Feb 06 19:36:51 2007 +0000 +++ b/src/specifier.c Tue Feb 06 20:01:42 2007 +0000 @@ -1310,18 +1310,17 @@ 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; } } }