Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

use Aquamacs as application menu name

revert change ca547ce (nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more carefully)
  • Loading branch information...
commit 88528f3227110454b7ac0d82df9ae47c3052d3da 1 parent 8695180
@davidswelt authored
Showing with 7 additions and 9 deletions.
  1. +6 −8 src/nsmenu.m
  2. +1 −1  src/nsterm.m
View
14 src/nsmenu.m
@@ -160,7 +160,7 @@
if (menu == nil)
{
- menu = [[EmacsMenu alloc] initWithTitle: @"Aquamacs/Cocoa"];
+ menu = [[EmacsMenu alloc] initWithTitle: @"Aquamacs"];
needsSet = YES;
}
else
@@ -178,7 +178,7 @@
/* widget_value is a straightforward object translation of emacs's
Byzantine lisp menu structures */
wv = xmalloc_widget_value ();
- wv->name = "Aquamacs/Cocoa";
+ wv->name = "Aquamacs";
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
@@ -621,17 +621,15 @@ -(NSString *)parseKeyEquiv: (char *)key
tpos++;
#ifndef NS_IMPL_COCOA
- if ((*tpos == 's') && (*(tpos+1) == '-'))
+ if (*tpos != 's')
#endif
{
- return [NSString stringWithFormat: @"%c", tpos[2]];
+ keyEquivModMask = 0; /* signal */
+ return [NSString stringWithUTF8String: tpos];
}
-
- keyEquivModMask = 0; /* signal */
- return [NSString stringWithUTF8String: tpos];
+ return [NSString stringWithFormat: @"%c", tpos[2]];
}
-
- (NSMenuItem *)addItemWithWidgetValue: (void *)wvptr
{
NSMenuItem *item;
View
2  src/nsterm.m
@@ -4115,7 +4115,7 @@ Needs to be here because ns_initialize_display_info () uses AppKit classes.
keyEquivalent: @"q"
atIndex: 10];
- item = [mainMenu insertItemWithTitle: @"Aquamacs Emacs"
+ item = [mainMenu insertItemWithTitle: @"Aquamacs"
action: @selector (menuDown:)
keyEquivalent: @""
atIndex: 0];
Please sign in to comment.
Something went wrong with that request. Please try again.