From 2fb0ce67dec721b2c87c4b87bc034cbaeaf8dc49 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 1 Jun 2004 20:26:52 +0000 Subject: [PATCH] (EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true. --- src/ChangeLog | 32 ++++++++++++++++---------------- src/mem-limits.h | 6 ++++-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 138a1860235..ecae93d1309 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,11 +1,14 @@ +2004-06-01 Stefan Monnier + + * mem-limits.h (EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true. + 2004-05-29 YAMAMOTO Mitsuharu * macfns.c: Don't include ccl.h. [MAC_OSX]: Don't include QuickTime/QuickTime.h. - [!MAC_OSX]: Don't include alloca.h, Windows.h, Gestalt.h, or - TextUtils.h. - (Fx_create_frame): Sync with xfns.c. Initialize cursor - descriptors. + [!MAC_OSX]: Don't include alloca.h, Windows.h, Gestalt.h, + or TextUtils.h. + (Fx_create_frame): Sync with xfns.c. Initialize cursor descriptors. (Fx_display_mm_height, Fx_display_mm_width): Calculate length from display height/width. (compute_tip_xy, Vx_max_tooltip_size): Declare. @@ -13,11 +16,10 @@ (x_create_tip_frame, Fx_show_tip, Fx_hide_tip): Sync with xfns.c. (syms_of_macfns): Initialize Qcancel_timer, Vx_max_tooltip_size, and last_show_tip_args. - + * macgui.h [!MAC_OSX]: Include Gestalt.h. (Cursor, No_Cursor): New defines. - [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility - macro. + [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility macro. [!TARGET_API_MAC_CARBON] (arrow_cursor): Declare. * macmenu.c (mac_menu_show, mac_dialog): Use SetPortWindowPort. @@ -45,11 +47,9 @@ (x_scroll_bar_handle_click): Set `(PORTION . WHOLE)' part in a scroll-bar click event. (mac_define_frame_cursor): Change the pointer shape. - (x_free_frame_resources): Reset tip_window to NULL when it is - disposed. + (x_free_frame_resources): Reset tip_window to NULL when it is disposed. [!TARGET_API_MAC_CARBON] (arrow_cursor): New variable. - [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize - arrow_cursor. + [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize arrow_cursor. (do_window_update): Don't do anything if the updated window is the tooltip window. (do_mouse_moved): Handle mouse movement events here (previously in @@ -57,8 +57,8 @@ dpyinfo->mouse_face_hidden is set. (do_os_event, do_events): Remove (now in XTread_socket). (XTread_socket): Immediately return if interrupt_input_blocked. - Loop until all the events in the queue are processed. Rearrange - codes for mouse grabbing. Add tooltip support. Include the + Loop until all the events in the queue are processed. + Rearrange codes for mouse grabbing. Add tooltip support. Include the contents of do_os_event and do_events. Remove mouse movement handling (now in do_mouse_moved). Add the case where Vmouse_highlight has an integer value. @@ -67,8 +67,8 @@ excess initializations. (make_mac_terminal_frame): Previous initializations in make_mac_frame are moved here. - (mac_initialize_display_info): Initialize - dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden. + (mac_initialize_display_info): + Initialize dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden. * xdisp.c [MAC_OS] (No_Cursor): Remove variable. (define_frame_cursor1): Don't treat HAVE_CARBON as a special case. @@ -8620,7 +8620,7 @@ 2002-08-19 Kim F. Storm - * keyboard.c (Fclear_this_command_keys): Added optional arg + * keyboard.c (Fclear_this_command_keys): Add optional arg KEEP-RECORD to avoid clearing lossage when we just want to clear the current key sequence (kmacro needs this). diff --git a/src/mem-limits.h b/src/mem-limits.h index 578cf59f12e..57a79863a1b 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -1,5 +1,5 @@ /* Includes for memory limit warnings. - Copyright (C) 1990, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1990, 93, 94, 95, 1996, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -81,7 +81,9 @@ typedef unsigned long SIZE; #define NULL ((POINTER) 0) extern POINTER start_of_data (); -#ifdef DATA_SEG_BITS +#if defined USE_LSB_TAG +#define EXCEEDS_LISP_PTR(ptr) 0 +#elif defined DATA_SEG_BITS #define EXCEEDS_LISP_PTR(ptr) \ (((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS) #else -- 2.39.5