diff options
| author | Miles Bader | 2006-07-06 08:59:39 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-07-06 08:59:39 +0000 |
| commit | 6a46b0188332c8007c23014bd0ba97441be6abe8 (patch) | |
| tree | e6bad7efe8102d87934fbae8f1b34341cd4e4957 /src/macgui.h | |
| parent | 5ed089581a49f8f0eba2d911203ff5db57eac322 (diff) | |
| parent | 978db1472a9d4bbaafbc93b9176f7c409ac209bd (diff) | |
| download | emacs-6a46b0188332c8007c23014bd0ba97441be6abe8.tar.gz emacs-6a46b0188332c8007c23014bd0ba97441be6abe8.zip | |
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
Diffstat (limited to 'src/macgui.h')
| -rw-r--r-- | src/macgui.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macgui.h b/src/macgui.h index 90688e5703e..01f5317aad6 100644 --- a/src/macgui.h +++ b/src/macgui.h | |||
| @@ -114,7 +114,7 @@ typedef unsigned long Time; | |||
| 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 |