From ef029e5a69e9c653f5838674e4fbc382421106b9 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Thu, 14 Jul 2005 09:23:40 +0000 Subject: [PATCH] (mac_window_to_frame): Remove duplicate define. --- src/ChangeLog | 7 +++++++ 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 @@ +2005-07-14 YAMAMOTO Mitsuharu + + * macselect.c (get_scrap_target_type_list): Avoid NULL pointer + dereference. + + * macterm.c (mac_window_to_frame): Remove duplicate define. + 2005-07-14 Kenichi Handa * 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. */ (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey) \ : controlKey) #define macAltKey (NILP (Vmac_command_key_is_meta) ? cmdKey : optionKey) - -#define mac_window_to_frame(wp) (((mac_output *) GetWRefCon (wp))->mFP) /* Non-nil means Emacs uses toolkit scroll bars. */ -- 2.39.5