diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-07-11 18:31:41 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-07-11 18:31:41 +0000 |
| commit | fe5a01629a482b507c2f481687b96c2ecb46a9c3 (patch) | |
| tree | d8dca7f4a5b4dd6081c6f9c1fcd7969b76ea81e6 /src/w32menu.c | |
| parent | 8ee5b6a3963659c95e124efda55c11dbe045957d (diff) | |
| download | emacs-fe5a01629a482b507c2f481687b96c2ecb46a9c3.tar.gz emacs-fe5a01629a482b507c2f481687b96c2ecb46a9c3.tar.bz2 emacs-fe5a01629a482b507c2f481687b96c2ecb46a9c3.zip | |
(menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.
(w32_dialog_show): Remove unused `save_wv' variable.
(name_is_separator): Recognize "--:foo" and "--foo-bar".
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 043e6731f0e..ca0ed0b6320 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -964,6 +964,7 @@ menubar_selection_callback (FRAME_PTR f, void * client_data) if (!f) return; + entry = Qnil; subprefix_stack = (Lisp_Object *) alloca (f->menu_bar_items_used * sizeof (Lisp_Object)); vector = f->menu_bar_vector; prefix = Qnil; @@ -1765,7 +1766,7 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error) { Lisp_Object prefix, entry; - prefix = Qnil; + prefix = entry = Qnil; i = 0; while (i < menu_items_used) { @@ -1833,7 +1834,7 @@ w32_dialog_show (f, keymaps, title, error) char dialog_name[6]; int menu_item_selection; - widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0; + widget_value *wv, *first_wv = 0, *prev_wv = 0; /* Number of elements seen so far, before boundary. */ int left_count = 0; @@ -2012,9 +2013,14 @@ static int name_is_separator (name) char *name; { - /* Check if name string consists of only dashes ('-') */ + char *start = name; + + /* Check if name string consists of only dashes ('-'). */ while (*name == '-') name++; - return (*name == '\0'); + /* Separators can also be of the form "--:TripleSuperMegaEtched" + or "--deep-shadow". We don't implement them yet, se we just treat + them like normal separators. */ + return (*name == '\0' || start + 2 == name); } |