Mercurial > emacs
comparison src/emacs.c @ 90105:7e3f621f1dd4
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-15
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
Move Gnus images into etc/images
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
Update from CVS: lisp/imap.el (imap-log): Doc fix.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 18 Feb 2005 00:41:50 +0000 |
parents | 6d92d69fae33 04686828d0da |
children | 29e773288013 |
comparison
equal
deleted
inserted
replaced
90104:a01e7a9f1659 | 90105:7e3f621f1dd4 |
---|---|
40 #include <sys/ioctl.h> | 40 #include <sys/ioctl.h> |
41 #endif | 41 #endif |
42 | 42 |
43 #ifdef WINDOWSNT | 43 #ifdef WINDOWSNT |
44 #include <fcntl.h> | 44 #include <fcntl.h> |
45 #include <windows.h> /* just for w32.h */ | |
46 #include "w32.h" | |
45 #endif | 47 #endif |
46 | 48 |
47 #include "lisp.h" | 49 #include "lisp.h" |
48 #include "commands.h" | 50 #include "commands.h" |
49 #include "intervals.h" | 51 #include "intervals.h" |
1658 /* Initialization that must be done even if the global variable | 1660 /* Initialization that must be done even if the global variable |
1659 initialized is non zero. */ | 1661 initialized is non zero. */ |
1660 #ifdef HAVE_NTGUI | 1662 #ifdef HAVE_NTGUI |
1661 globals_of_w32fns (); | 1663 globals_of_w32fns (); |
1662 globals_of_w32menu (); | 1664 globals_of_w32menu (); |
1665 globals_of_w32select (); | |
1663 #endif /* HAVE_NTGUI */ | 1666 #endif /* HAVE_NTGUI */ |
1664 } | 1667 } |
1665 | 1668 |
1666 init_charset (); | 1669 init_charset (); |
1667 | 1670 |