diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-02-02 12:33:07 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-02-02 12:33:07 +0000 |
| commit | d0a76a6eceb0b6f31d4d97e2f709543a863dc16d (patch) | |
| tree | ebf45c63e13c0b492d23db246a91a8e965b64c78 | |
| parent | 5338a63986a6bc4e486c1ca2e3260586b6ce62f7 (diff) | |
| download | emacs-d0a76a6eceb0b6f31d4d97e2f709543a863dc16d.tar.gz emacs-d0a76a6eceb0b6f31d4d97e2f709543a863dc16d.tar.bz2 emacs-d0a76a6eceb0b6f31d4d97e2f709543a863dc16d.zip | |
formatting in ChangeLog, wording change to comment in nsterm.m
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 4 |
2 files changed, 4 insertions, 2 deletions
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 <dann@ics.uci.edu> 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 |