Mercurial > emacs
comparison src/fns.c @ 90384:c156f6a9e7b5
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 204-225)
- Update from CVS
- Sync from erc--emacs--0
- Merge from gnus--rel--5.10
- Improve tq.el.
- Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.
* gnus--rel--5.10 (patch 81-85)
- Update from CVS
- Merge from emacs--devo--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 17 Apr 2006 08:41:12 +0000 |
parents | e6bf73e43cf4 0a13b0324d7a |
children | cc49fe5026c6 |
comparison
equal
deleted
inserted
replaced
90383:ab20fb198dda | 90384:c156f6a9e7b5 |
---|---|
46 #include "keymap.h" | 46 #include "keymap.h" |
47 #include "intervals.h" | 47 #include "intervals.h" |
48 #include "frame.h" | 48 #include "frame.h" |
49 #include "window.h" | 49 #include "window.h" |
50 #include "blockinput.h" | 50 #include "blockinput.h" |
51 #if defined (HAVE_MENUS) && defined (HAVE_X_WINDOWS) | 51 #ifdef HAVE_MENUS |
52 #if defined (HAVE_X_WINDOWS) | |
52 #include "xterm.h" | 53 #include "xterm.h" |
54 #elif defined (MAC_OS) | |
55 #include "macterm.h" | |
56 #endif | |
53 #endif | 57 #endif |
54 | 58 |
55 #ifndef NULL | 59 #ifndef NULL |
56 #define NULL ((POINTER_TYPE *)0) | 60 #define NULL ((POINTER_TYPE *)0) |
57 #endif | 61 #endif |