aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2012-08-22 11:55:35 +0200
committerJan Djärv2012-08-22 11:55:35 +0200
commit4ce7a13803d72d6def8943033a94656f9b02cbd8 (patch)
tree1c65377a42ef8493b03a5faad9b7a5a349da34ee /src
parentcaceae2529106eef4b5cc2b56c0cc6319ea7fcdf (diff)
downloademacs-4ce7a13803d72d6def8943033a94656f9b02cbd8.tar.gz
emacs-4ce7a13803d72d6def8943033a94656f9b02cbd8.zip
* nsterm.m (insertText:): Don't clear modifiers if code is space.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c43404fa438..d7595e69a65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-08-22 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (insertText:): Don't clear modifiers if code is space.
4
12012-08-22 Paul Eggert <eggert@cs.ucla.edu> 52012-08-22 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * fontset.c (FONTSET_ADD): Return void, not Lisp_Object. 7 * fontset.c (FONTSET_ADD): Return void, not Lisp_Object.
diff --git a/src/nsterm.m b/src/nsterm.m
index 12ca52684e6..c892a5486a7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5091,7 +5091,8 @@ not_in_argv (NSString *arg)
5091 /* TODO: still need this? */ 5091 /* TODO: still need this? */
5092 if (code == 0x2DC) 5092 if (code == 0x2DC)
5093 code = '~'; /* 0x7E */ 5093 code = '~'; /* 0x7E */
5094 emacs_event->modifiers = 0; 5094 if (code != 32) /* Space */
5095 emacs_event->modifiers = 0;
5095 emacs_event->kind 5096 emacs_event->kind
5096 = code > 0xFF ? MULTIBYTE_CHAR_KEYSTROKE_EVENT : ASCII_KEYSTROKE_EVENT; 5097 = code > 0xFF ? MULTIBYTE_CHAR_KEYSTROKE_EVENT : ASCII_KEYSTROKE_EVENT;
5097 emacs_event->code = code; 5098 emacs_event->code = code;