Mercurial > emacs
comparison src/macgui.h @ 90519:138ce2701550
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Jul 2006 08:59:39 +0000 |
parents | a8190f7e546e fa67beba36e1 |
children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
90518:64c755511769 | 90519:138ce2701550 |
---|---|
112 #endif | 112 #endif |
113 #endif | 113 #endif |
114 | 114 |
115 /* Whether to use Text Services Manager. */ | 115 /* Whether to use Text Services Manager. */ |
116 #ifndef USE_MAC_TSM | 116 #ifndef USE_MAC_TSM |
117 #ifdef MAC_OSX | 117 #if TARGET_API_MAC_CARBON |
118 #define USE_MAC_TSM 1 | 118 #define USE_MAC_TSM 1 |
119 #endif | 119 #endif |
120 #endif | 120 #endif |
121 | 121 |
122 typedef WindowPtr Window; | 122 typedef WindowPtr Window; |