Mercurial > hg > xemacs-beta
diff src/device-x.c @ 5126:2a462149bd6a ben-lisp-object
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Feb 2010 19:04:27 -0600 |
| parents | b5df3737028a 92dc90c0bb40 |
| children | a9c41067dd88 |
line wrap: on
line diff
--- a/src/device-x.c Wed Feb 24 01:58:04 2010 -0600 +++ b/src/device-x.c Wed Feb 24 19:04:27 2010 -0600 @@ -1,7 +1,7 @@ /* Device functions for X windows. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994, 1995 Free Software Foundation, Inc. - Copyright (C) 2001, 2002, 2004 Ben Wing. + Copyright (C) 2001, 2002, 2004, 2010 Ben Wing. This file is part of XEmacs. @@ -486,7 +486,7 @@ vi_in.visualid = XVisualIDFromVisual (visual); vi_out = XGetVisualInfo (dpy, /*VisualScreenMask|*/VisualIDMask, &vi_in, &out_count); - if (! vi_out) ABORT (); + assert (vi_out); d = vi_out [0].depth; XFree ((char *) vi_out); return d; @@ -1562,9 +1562,9 @@ db = XtDatabase (display); codesys = coding_system_of_xrm_database (db); Dynarr_add (name_Extbyte_dynarr, '.'); - Dynarr_add_lisp_string (name_Extbyte_dynarr, name, Qbinary); + Dynarr_add_ext_lisp_string (name_Extbyte_dynarr, name, Qbinary); Dynarr_add (class_Extbyte_dynarr, '.'); - Dynarr_add_lisp_string (class_Extbyte_dynarr, class_, Qbinary); + Dynarr_add_ext_lisp_string (class_Extbyte_dynarr, class_, Qbinary); Dynarr_add (name_Extbyte_dynarr, '\0'); Dynarr_add (class_Extbyte_dynarr, '\0');