Mercurial > emacs
comparison src/xfns.c @ 90376:1ad066d533a9
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-50
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 185-187)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 71-72)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 31 Mar 2006 04:56:24 +0000 |
parents | e6bf73e43cf4 93b946d73590 |
children | 654ff3b48a81 |
comparison
equal
deleted
inserted
replaced
90375:e6bf73e43cf4 | 90376:1ad066d533a9 |
---|---|
815 g_error_free (err); | 815 g_error_free (err); |
816 | 816 |
817 UNBLOCK_INPUT; | 817 UNBLOCK_INPUT; |
818 } | 818 } |
819 | 819 |
820 UNGCPRO; | |
821 return result; | 820 return result; |
822 } | 821 } |
823 | 822 |
824 int | 823 int |
825 xg_set_icon_from_xpm_data (f, data) | 824 xg_set_icon_from_xpm_data (f, data) |