aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Robert2009-02-02 12:33:07 +0000
committerAdrian Robert2009-02-02 12:33:07 +0000
commitd0a76a6eceb0b6f31d4d97e2f709543a863dc16d (patch)
treeebf45c63e13c0b492d23db246a91a8e965b64c78
parent5338a63986a6bc4e486c1ca2e3260586b6ce62f7 (diff)
downloademacs-d0a76a6eceb0b6f31d4d97e2f709543a863dc16d.tar.gz
emacs-d0a76a6eceb0b6f31d4d97e2f709543a863dc16d.zip
formatting in ChangeLog, wording change to comment in nsterm.m
-rw-r--r--src/ChangeLog2
-rw-r--r--src/nsterm.m4
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 @@
2 2
3 * nsterm.m (ns_read_socket): Copy 2009-01-29 and 2009-01-30 3 * nsterm.m (ns_read_socket): Copy 2009-01-29 and 2009-01-30
4 XT,w32read_socket changes to ns_read_socket. 4 XT,w32read_socket changes to ns_read_socket.
5
5 * keyboard.c (handle_interrupt): Don't call 6 * keyboard.c (handle_interrupt): Don't call
6 quit_throw_to_read_char() under NS. 7 quit_throw_to_read_char() under NS.
8
7 * blockinput.h: Remove NS-specific code. 9 * blockinput.h: Remove NS-specific code.
8 10
92009-01-30 Dan Nicolaescu <dann@ics.uci.edu> 112009-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,
3151 3151
3152#ifdef COCOA_EXPERIMENTAL_CTRL_G 3152#ifdef COCOA_EXPERIMENTAL_CTRL_G
3153 /* causes Feval to abort; should probably set this in calling code when 3153 /* causes Feval to abort; should probably set this in calling code when
3154 it IS actually called from signal handler (which is only the case 3154 it IS actually called from signal handler, in which case we need to
3155 under NS if SYNC_INPUT is off) */ 3155 defer ns_update_menubar() calls */
3156 ++handling_signal; 3156 ++handling_signal;
3157#endif 3157#endif
3158 3158