Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
a3b53a85
Commit
a3b53a85
authored
Jan 22, 2009
by
Adrian Robert
Browse files
* nsterm.m (EmavsView-keyDown:): Treat nil as Qnone for ns_alternate_modifier. (Bug#1217)
parent
c27428a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
src/ChangeLog
src/ChangeLog
+5
-0
src/nsterm.m
src/nsterm.m
+8
-1
No files found.
src/ChangeLog
View file @
a3b53a85
2009-01-21 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsterm.m (EmavsView-keyDown:): Treat nil as Qnone for
ns_alternate_modifier. (Bug#1217)
2009-01-22 Chong Yidong <cyd@stupidchicken.com>
* fileio.c (Vwrite_region_post_annotation_function)
...
...
src/nsterm.m
View file @
a3b53a85
...
...
@@ -4213,11 +4213,17 @@ - (NSMenu *)applicationDockMenu: (NSApplication *) sender
/* TODO: these may help w/IO switching btwn terminal and NSApp */
- (void)applicationWillBecomeActive: (NSNotification *)notification
{
//ns_app_active=YES;
}
- (void)applicationDidBecomeActive: (NSNotification *)notification
{
//ns_app_active=YES;
}
- (void)applicationDidResignActive: (NSNotification *)notification
{
//ns_app_active=NO;
ns_send_appdefined (-1);
}
...
...
@@ -4505,7 +4511,8 @@ NSView most recently updated (I guess), which is not the correct one.
if (flags & NSAlternateKeyMask) /* default = meta */
{
if (EQ (ns_alternate_modifier, Qnone) && !fnKeysym)
if ((NILP (ns_alternate_modifier) || EQ (ns_alternate_modifier, Qnone))
&& !fnKeysym)
{ /* accept pre-interp alt comb */
if ([[theEvent characters] length] > 0)
code = [[theEvent characters] characterAtIndex: 0];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment