summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog6
-rw-r--r--src/nsterm.m1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d68e857d388..4823d873847 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-22 Adrian Robert <Adrian.B.Robert@gmail.com>
+
+ * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified
+ key to emacs, treat as unmodified (go to input manager
+ processing).
+
2011-02-22 Paul Eggert <eggert@cs.ucla.edu>
Assume S_ISLNK etc. work, since gnulib supports this.
diff --git a/src/nsterm.m b/src/nsterm.m
index a09c95c7d01..038709869a9 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4542,6 +4542,7 @@ ns_term_shutdown (int sig)
/* if it was a function key or had modifiers, pass it directly to emacs */
if (fnKeysym || (emacs_event->modifiers
+ && (emacs_event->modifiers != shift_modifier)
&& [[theEvent charactersIgnoringModifiers] length] > 0))
/*[[theEvent characters] length] */
{