HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lisp.h: Fix a problem with aliasing and vector headers.
[bpt/emacs.git]
/
src
/
nsmenu.m
diff --git
a/src/nsmenu.m
b/src/nsmenu.m
index
95f651f
..
623c933
100644
(file)
--- a/
src/nsmenu.m
+++ b/
src/nsmenu.m
@@
-1,5
+1,5
@@
/* NeXT/Open/GNUstep and MacOSX Cocoa menu and toolbar module.
/* NeXT/Open/GNUstep and MacOSX Cocoa menu and toolbar module.
- Copyright (C) 2007
, 2008, 2009, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2007
-2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-65,8
+65,7
@@
extern Lisp_Object Qundefined, Qmenu_enable, Qmenu_bar_update_hook;
extern Lisp_Object QCtoggle, QCradio;
Lisp_Object Qdebug_on_next_call;
extern Lisp_Object QCtoggle, QCradio;
Lisp_Object Qdebug_on_next_call;
-extern Lisp_Object Voverriding_local_map, Voverriding_local_map_menu_flag,
- Qoverriding_local_map, Qoverriding_terminal_local_map;
+extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
extern long context_menu_value;
EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
extern long context_menu_value;
EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
@@
-356,7
+355,7
@@
ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
/* if (submenu && strcmp (submenuTitle, SDATA (string)))
continue; */
/* if (submenu && strcmp (submenuTitle, SDATA (string)))
continue; */
- wv->name =
(char *)
SDATA (string);
+ wv->name =
S
SDATA (string);
update_submenu_strings (wv->contents);
wv = wv->next;
}
update_submenu_strings (wv->contents);
wv = wv->next;
}
@@
-445,7
+444,7
@@
ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
strncpy (previous_strings[i/4], SDATA (string), 10);
wv = xmalloc_widget_value ();
strncpy (previous_strings[i/4], SDATA (string), 10);
wv = xmalloc_widget_value ();
- wv->name =
(char *)
SDATA (string);
+ wv->name =
S
SDATA (string);
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
@@
-834,7
+833,7
@@
ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
}
#endif
pane_string = (NILP (pane_name)
}
#endif
pane_string = (NILP (pane_name)
- ? "" :
(char *)
SDATA (pane_name));
+ ? "" :
S
SDATA (pane_name));
/* If there is just one top-level pane, put all its items directly
under the top-level menu. */
if (menu_items_n_panes == 1)
/* If there is just one top-level pane, put all its items directly
under the top-level menu. */
if (menu_items_n_panes == 1)
@@
-899,9
+898,9
@@
ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
prev_wv->next = wv;
else
save_wv->contents = wv;
prev_wv->next = wv;
else
save_wv->contents = wv;
- wv->name =
(char *)
SDATA (item_name);
+ wv->name =
S
SDATA (item_name);
if (!NILP (descrip))
if (!NILP (descrip))
- wv->key =
(char *)
SDATA (descrip);
+ wv->key =
S
SDATA (descrip);
wv->value = 0;
/* If this item has a null value,
make the call_data null so that it won't display a box
wv->value = 0;
/* If this item has a null value,
make the call_data null so that it won't display a box
@@
-950,7
+949,7
@@
ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
title = ENCODE_MENU_STRING (title);
#endif
title = ENCODE_MENU_STRING (title);
#endif
- wv_title->name =
(char *)
SDATA (title);
+ wv_title->name =
S
SDATA (title);
wv_title->enabled = NO;
wv_title->button_type = BUTTON_TYPE_NONE;
wv_title->help = Qnil;
wv_title->enabled = NO;
wv_title->button_type = BUTTON_TYPE_NONE;
wv_title->help = Qnil;
@@
-1037,7
+1036,7
@@
update_frame_tool_bar (FRAME_PTR f)
helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
if (NILP (helpObj))
helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
if (NILP (helpObj))
helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
- helpText = NILP (helpObj) ? "" :
(char *)
SDATA (helpObj);
+ helpText = NILP (helpObj) ? "" :
S
SDATA (helpObj);
/* Ignore invalid image specifications. */
if (!valid_image_p (image))
/* Ignore invalid image specifications. */
if (!valid_image_p (image))
@@
-1706,7
+1705,6
@@
void process_dialog (id window, Lisp_Object list)
- (Lisp_Object)runDialogAt: (NSPoint)p
{
NSInteger ret;
- (Lisp_Object)runDialogAt: (NSPoint)p
{
NSInteger ret;
- extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */
/* initiate a session that will be ended by pop_down_menu */
popupSession = [NSApp beginModalSessionForWindow: self];
/* initiate a session that will be ended by pop_down_menu */
popupSession = [NSApp beginModalSessionForWindow: self];
@@
-1716,7
+1714,7
@@
void process_dialog (id window, Lisp_Object list)
{
/* Run this for timers.el, indep of atimers; might not return.
TODO: use return value to avoid calling every iteration. */
{
/* Run this for timers.el, indep of atimers; might not return.
TODO: use return value to avoid calling every iteration. */
- timer_check (
1
);
+ timer_check ();
[NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]];
}
[NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]];
}
@@
-1797,4
+1795,3
@@
syms_of_nsmenu (void)
staticpro (&Qdebug_on_next_call);
}
staticpro (&Qdebug_on_next_call);
}
-// arch-tag: 75773656-52e5-4c44-a398-47bd87b32619