diff options
| author | Steven Tamm | 2003-01-02 22:36:23 +0000 |
|---|---|---|
| committer | Steven Tamm | 2003-01-02 22:36:23 +0000 |
| commit | 8c609cffa6673cbef538b08f4ce75284b07e55d1 (patch) | |
| tree | 2c4bb7c0317f4fed87b231407f72a49e5f4cf94b /src | |
| parent | b59b77f1367306842213a2300c62fa24cea49fb8 (diff) | |
| download | emacs-8c609cffa6673cbef538b08f4ce75284b07e55d1.tar.gz emacs-8c609cffa6673cbef538b08f4ce75284b07e55d1.zip | |
* macterm.c (syms_of_macterm): Provide the feature "mac-carbon" to
distinguish Carbon GUI builds from X11 builds on darwin.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/macterm.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b9c6c7ed27e..b4d5cb9397b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-01-02 Steven Tamm <steventamm@mac.com> | ||
| 2 | |||
| 3 | * macterm.c (syms_of_macterm): Provide the feature "mac-carbon" to | ||
| 4 | distinguish Carbon GUI builds from X11 builds on darwin. | ||
| 5 | |||
| 1 | 2002-12-30 Steven Tamm <steventamm@mac.com> | 6 | 2002-12-30 Steven Tamm <steventamm@mac.com> |
| 2 | 7 | ||
| 3 | * macterm.c (syms_of_macterm): Set mac-wheel-button-is-mouse-2 | 8 | * macterm.c (syms_of_macterm): Set mac-wheel-button-is-mouse-2 |
diff --git a/src/macterm.c b/src/macterm.c index 79cb7106821..cae4172854e 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -13693,6 +13693,8 @@ syms_of_macterm () | |||
| 13693 | x_error_message_string = Qnil; | 13693 | x_error_message_string = Qnil; |
| 13694 | #endif | 13694 | #endif |
| 13695 | 13695 | ||
| 13696 | Fprovide (intern ("mac-carbon"), Qnil); | ||
| 13697 | |||
| 13696 | staticpro (&x_display_name_list); | 13698 | staticpro (&x_display_name_list); |
| 13697 | x_display_name_list = Qnil; | 13699 | x_display_name_list = Qnil; |
| 13698 | 13700 | ||