aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Robert2009-07-23 11:52:45 +0000
committerAdrian Robert2009-07-23 11:52:45 +0000
commit5dd9a6f79996ac57275b150b336a492ec8f67e58 (patch)
tree9ebf1f6b30d597d2427c68fb0a01dc6f9f054dc0 /src
parenta707eb05425baef7d0cd27f469c2e5ae4b59f9ac (diff)
downloademacs-5dd9a6f79996ac57275b150b336a492ec8f67e58.tar.gz
emacs-5dd9a6f79996ac57275b150b336a492ec8f67e58.zip
* nsterm.m (EmacsView-keyUp:): Only act when running under Tiger.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e5c2c730d56..3d4ef29a877 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-07-23 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * nsterm.m (EmacsView-keyUp:): Only act when running under Tiger.
4
12009-07-22 Jason Rumney <jasonr@gnu.org> 52009-07-22 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32fns.c (w32_wnd_proc) [WM_IME_STARTCOMPOSITION]: Position 7 * w32fns.c (w32_wnd_proc) [WM_IME_STARTCOMPOSITION]: Position
diff --git a/src/nsterm.m b/src/nsterm.m
index 32075cf20e1..e140b0eaefb 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4561,12 +4561,14 @@ extern void update_window_cursor (struct window *w, int on);
4561/* Needed to pick up Ctrl-tab and possibly other events that OS X has 4561/* Needed to pick up Ctrl-tab and possibly other events that OS X has
4562 decided not to send key-down for. 4562 decided not to send key-down for.
4563 See http://osdir.com/ml/editors.vim.mac/2007-10/msg00141.html 4563 See http://osdir.com/ml/editors.vim.mac/2007-10/msg00141.html
4564 This only applies on Tiger and earlier.
4564 If it matches one of these, send it on to keyDown. */ 4565 If it matches one of these, send it on to keyDown. */
4565-(void)keyUp: (NSEvent *)theEvent 4566-(void)keyUp: (NSEvent *)theEvent
4566{ 4567{
4567 int flags = [theEvent modifierFlags]; 4568 int flags = [theEvent modifierFlags];
4568 int code = [theEvent keyCode]; 4569 int code = [theEvent keyCode];
4569 if (code == 0x30 && (flags & NSControlKeyMask) && !(flags & NSCommandKeyMask)) 4570 if (floor (NSAppKitVersionNumber) <= 824 /*NSAppKitVersionNumber10_4*/ &&
4571 code == 0x30 && (flags & NSControlKeyMask) && !(flags & NSCommandKeyMask))
4570 { 4572 {
4571 if (NS_KEYLOG) 4573 if (NS_KEYLOG)
4572 fprintf (stderr, "keyUp: passed test"); 4574 fprintf (stderr, "keyUp: passed test");