diff options
| author | Miles Bader | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 /src/macgui.h | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
Diffstat (limited to 'src/macgui.h')
| -rw-r--r-- | src/macgui.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/macgui.h b/src/macgui.h index 690840c6c33..90688e5703e 100644 --- a/src/macgui.h +++ b/src/macgui.h | |||
| @@ -112,6 +112,13 @@ typedef unsigned long Time; | |||
| 112 | #endif | 112 | #endif |
| 113 | #endif | 113 | #endif |
| 114 | 114 | ||
| 115 | /* Whether to use Text Services Manager. */ | ||
| 116 | #ifndef USE_MAC_TSM | ||
| 117 | #ifdef MAC_OSX | ||
| 118 | #define USE_MAC_TSM 1 | ||
| 119 | #endif | ||
| 120 | #endif | ||
| 121 | |||
| 115 | typedef WindowPtr Window; | 122 | typedef WindowPtr Window; |
| 116 | typedef GWorldPtr Pixmap; | 123 | typedef GWorldPtr Pixmap; |
| 117 | 124 | ||