diff options
| author | YAMAMOTO Mitsuharu | 2005-07-14 09:23:40 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2005-07-14 09:23:40 +0000 |
| commit | ef029e5a69e9c653f5838674e4fbc382421106b9 (patch) | |
| tree | 14c767f9a2b12615205473a596cf55906403d664 /src | |
| parent | 10b8ef61c0f25060b2d1f865ba85edf62a207881 (diff) | |
| download | emacs-ef029e5a69e9c653f5838674e4fbc382421106b9.tar.gz emacs-ef029e5a69e9c653f5838674e4fbc382421106b9.zip | |
(mac_window_to_frame): Remove duplicate define.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/macterm.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 160e667fbf8..c34dca4e6d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2005-07-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * macselect.c (get_scrap_target_type_list): Avoid NULL pointer | ||
| 4 | dereference. | ||
| 5 | |||
| 6 | * macterm.c (mac_window_to_frame): Remove duplicate define. | ||
| 7 | |||
| 1 | 2005-07-14 Kenichi Handa <handa@m17n.org> | 8 | 2005-07-14 Kenichi Handa <handa@m17n.org> |
| 2 | 9 | ||
| 3 | * coding.c (code_convert_region_unwind): ARG is changed to a cons. | 10 | * coding.c (code_convert_region_unwind): ARG is changed to a cons. |
diff --git a/src/macterm.c b/src/macterm.c index 533464390c5..22471f46e8c 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -94,8 +94,6 @@ Boston, MA 02110-1301, USA. */ | |||
| 94 | (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey) \ | 94 | (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey) \ |
| 95 | : controlKey) | 95 | : controlKey) |
| 96 | #define macAltKey (NILP (Vmac_command_key_is_meta) ? cmdKey : optionKey) | 96 | #define macAltKey (NILP (Vmac_command_key_is_meta) ? cmdKey : optionKey) |
| 97 | |||
| 98 | #define mac_window_to_frame(wp) (((mac_output *) GetWRefCon (wp))->mFP) | ||
| 99 | 97 | ||
| 100 | 98 | ||
| 101 | /* Non-nil means Emacs uses toolkit scroll bars. */ | 99 | /* Non-nil means Emacs uses toolkit scroll bars. */ |