aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Robert2011-02-22 16:13:54 +0200
committerAdrian Robert2011-02-22 16:13:54 +0200
commitbdaa0745ee781a8d03b4015ea75e8deb410179e8 (patch)
treea3c2ab77e812cd666521911c04f638edffb8ae8c
parent8e22bee0402f250c522f58acaa7ebebfa283615a (diff)
downloademacs-bdaa0745ee781a8d03b4015ea75e8deb410179e8.tar.gz
emacs-bdaa0745ee781a8d03b4015ea75e8deb410179e8.zip
* nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified key to emacs, treat as unmodified (go to input manager processing).
-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 @@
12011-02-22 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified
4 key to emacs, treat as unmodified (go to input manager
5 processing).
6
12011-02-22 Paul Eggert <eggert@cs.ucla.edu> 72011-02-22 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Assume S_ISLNK etc. work, since gnulib supports this. 9 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)
4542 4542
4543 /* if it was a function key or had modifiers, pass it directly to emacs */ 4543 /* if it was a function key or had modifiers, pass it directly to emacs */
4544 if (fnKeysym || (emacs_event->modifiers 4544 if (fnKeysym || (emacs_event->modifiers
4545 && (emacs_event->modifiers != shift_modifier)
4545 && [[theEvent charactersIgnoringModifiers] length] > 0)) 4546 && [[theEvent charactersIgnoringModifiers] length] > 0))
4546/*[[theEvent characters] length] */ 4547/*[[theEvent characters] length] */
4547 { 4548 {