summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Robert <Adrian.B.Robert@gmail.com>2009-07-23 11:50:29 +0000
committerAdrian Robert <Adrian.B.Robert@gmail.com>2009-07-23 11:50:29 +0000
commitf80038bf4902d76d37ab8c45e1767e3feac18f1d (patch)
tree5edec7b65660ba39c588f127a0e9ad9e18a0a024
parent58933d85604646669147b921c81374fde43e9bea (diff)
downloademacs-f80038bf4902d76d37ab8c45e1767e3feac18f1d.tar.gz
* nsterm.m (EmacsView-keyUp:): Only act when running under Tiger.
-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 c84ed27d87b..531da6406cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-23 Adrian Robert <Adrian.B.Robert@gmail.com>
+
+ * nsterm.m (EmacsView-keyUp:): Only act when running under Tiger.
+
2009-07-21 Chong Yidong <cyd@stupidchicken.com>
* fileio.c (Vauto_save_include_big_deletions): New variable.
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);
/* Needed to pick up Ctrl-tab and possibly other events that OS X has
decided not to send key-down for.
See http://osdir.com/ml/editors.vim.mac/2007-10/msg00141.html
+ This only applies on Tiger and earlier.
If it matches one of these, send it on to keyDown. */
-(void)keyUp: (NSEvent *)theEvent
{
int flags = [theEvent modifierFlags];
int code = [theEvent keyCode];
- if (code == 0x30 && (flags & NSControlKeyMask) && !(flags & NSCommandKeyMask))
+ if (floor (NSAppKitVersionNumber) <= 824 /*NSAppKitVersionNumber10_4*/ &&
+ code == 0x30 && (flags & NSControlKeyMask) && !(flags & NSCommandKeyMask))
{
if (NS_KEYLOG)
fprintf (stderr, "keyUp: passed test");