From: Adrian Robert Date: Mon, 2 Feb 2009 12:33:07 +0000 (+0000) Subject: formatting in ChangeLog, wording change to comment in nsterm.m X-Git-Tag: emacs-pretest-23.0.91~457 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0a76a6eceb0b6f31d4d97e2f709543a863dc16d;p=emacs.git formatting in ChangeLog, wording change to comment in nsterm.m --- diff --git a/src/ChangeLog b/src/ChangeLog index 5ff301544bd..36fe949e633 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,8 +2,10 @@ * nsterm.m (ns_read_socket): Copy 2009-01-29 and 2009-01-30 XT,w32read_socket changes to ns_read_socket. + * keyboard.c (handle_interrupt): Don't call quit_throw_to_read_char() under NS. + * blockinput.h: Remove NS-specific code. 2009-01-30 Dan Nicolaescu diff --git a/src/nsterm.m b/src/nsterm.m index b9902fbe774..411ce5b5c43 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3151,8 +3151,8 @@ ns_read_socket (struct terminal *terminal, int expected, #ifdef COCOA_EXPERIMENTAL_CTRL_G /* causes Feval to abort; should probably set this in calling code when - it IS actually called from signal handler (which is only the case - under NS if SYNC_INPUT is off) */ + it IS actually called from signal handler, in which case we need to + defer ns_update_menubar() calls */ ++handling_signal; #endif