From 0975aa2475b2691bcb646d56cb3be39f01843ef2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 28 Jan 2008 03:48:45 +0000 Subject: [PATCH] (read_char): Yet another int/Lisp_Object mixup (YAILOM). --- src/ChangeLog | 15 +++++++++------ src/keyboard.c | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 114bbc5b0e7..3986b4f9284 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-01-28 Stefan Monnier + + * keyboard.c (read_char): Yet another int/Lisp_Object mixup (YAILOM). + 2008-01-27 Dan Nicolaescu * Makefile.in: Remove references to unused macros. @@ -8,9 +12,8 @@ (g_b_init_get_sid_sub_authority_count): New static variables. (GetSidSubAuthority_Proc, GetSidSubAuthorityCount_Proc): New typedefs. (get_sid_sub_authority, get_sid_sub_authority_count): New functions. - (init_user_info): Use the above two new functions to retrieve uid - and gid. Use 500/513, the Windows defaults, as Administrator's - uid/gid. + (init_user_info): Use them to retrieve uid and gid. + Use 500/513, the Windows defaults, as Administrator's uid/gid. (fstat): Use pw_uid and pw_gid from the_passwd structure for st_uid and st_gid of the file. @@ -34,10 +37,10 @@ * keyboard.c (read_char): Restore echo_message_buffer after redisplay. - * buffer.c (reset_buffer_local_variables): Implement - `permanent-local-hook'. + * buffer.c (reset_buffer_local_variables): + Implement `permanent-local-hook'. (Qpermanent_local_hook): New variable. - (syms_of_buffer): init and staticpro it. + (syms_of_buffer): Init and staticpro it. 2008-01-25 Michael Albinus diff --git a/src/keyboard.c b/src/keyboard.c index 2187c22bdb7..fb6bec2cad8 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2704,7 +2704,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time) /* if redisplay was requested */ if (commandflag >= 0) { - int echo_current = echo_message_buffer == echo_area_buffer[0]; + int echo_current = EQ (echo_message_buffer, echo_area_buffer[0]); /* If there is pending input, process any events which are not user-visible, such as X selection_request events. */ -- 2.39.2