Mercurial > emacs
diff src/xfns.c @ 90242:5e2d3828e89f
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 581-597)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 133-141)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: texi/gnus.texi (RSS): Fix key description.
- Update from CVS: texi/gnus.texi (Document Server Internals): Addition.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 15 Oct 2005 00:26:05 +0000 |
parents | fa0da9b57058 2c78610a49f1 |
children | 7beb78bc1f8e |
line wrap: on
line diff
--- a/src/xfns.c Fri Oct 14 03:41:43 2005 +0000 +++ b/src/xfns.c Sat Oct 15 00:26:05 2005 +0000 @@ -3261,7 +3261,7 @@ /* We need to do this after creating the X window, so that the icon-creation functions can say whose icon they're describing. */ - x_default_parameter (f, parms, Qicon_type, Qnil, + x_default_parameter (f, parms, Qicon_type, Qt, "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL); x_default_parameter (f, parms, Qauto_raise, Qnil,