diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-07-04 13:16:03 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-07-04 13:16:03 -0600 |
| commit | 816e148694cd483aae8206b6187fed8b0ddb9b13 (patch) | |
| tree | 5ad32e904b59ca2f988342716242d4ef93a6115a | |
| parent | c7aed72b5ec34501f488b96591bbc018f76d351f (diff) | |
| download | alpine-816e148694cd483aae8206b6187fed8b0ddb9b13.tar.xz | |
* Bug fix: When trying to select a folder for saving a message, one can only enter
a subfolder by pressing the ">" command, rather than the normal navigation by
pressing "Return". Reported by Ulf-Dietrich Braunmann.
| -rw-r--r-- | alpine/folder.c | 33 | ||||
| -rw-r--r-- | pith/pine.hlp | 4 |
2 files changed, 18 insertions, 19 deletions
diff --git a/alpine/folder.c b/alpine/folder.c index 6997759e..64e9d7d0 100644 --- a/alpine/folder.c +++ b/alpine/folder.c @@ -3163,25 +3163,20 @@ folder_lister_km_sel_manager(SCROLL_S *sparms, int handle_hidden) && (fp = folder_entry(sparms->text.handles->h.f.index, FOLDERS(sparms->text.handles->h.f.context)))){ setbitn(FC_SEL_KEY, sparms->keys.bitmap); - if(fp->isdir){ - sparms->keys.menu->keys[FC_SEL_KEY].name = ">"; - menu_add_binding(sparms->keys.menu, '>', MC_CHOICE); - menu_add_binding(sparms->keys.menu, '.', MC_CHOICE); - if(F_ON(F_ARROW_NAV,ps_global)) - menu_add_binding(sparms->keys.menu, KEY_RIGHT, MC_CHOICE); - - if(fp->isfolder){ - sparms->keys.menu->keys[FC_SEL_KEY].label = N_("View Dir"); - setbitn(FC_ALTSEL_KEY, sparms->keys.bitmap); - menu_add_binding(sparms->keys.menu, 's', MC_OPENFLDR); - menu_add_binding(sparms->keys.menu, ctrl('M'), MC_OPENFLDR); - menu_add_binding(sparms->keys.menu, ctrl('J'), MC_OPENFLDR); - } - else{ - sparms->keys.menu->keys[FC_SEL_KEY].label = "[" N_("View Dir") "]"; - menu_add_binding(sparms->keys.menu, ctrl('M'), MC_CHOICE); - menu_add_binding(sparms->keys.menu, ctrl('J'), MC_CHOICE); - } + sparms->keys.menu->keys[FC_SEL_KEY].name = ">"; + menu_add_binding(sparms->keys.menu, '>', MC_CHOICE); + menu_add_binding(sparms->keys.menu, '.', MC_CHOICE); + if(F_ON(F_ARROW_NAV,ps_global)) + menu_add_binding(sparms->keys.menu, KEY_RIGHT, MC_CHOICE); + if(fp->isdir && !sparms->text.handles->is_dual_do_open){ + sparms->keys.menu->keys[KM_SEL_KEY].label = "[" N_("View Dir") "]"; + menu_add_binding(sparms->keys.menu, 'v', MC_CHOICE); + menu_add_binding(sparms->keys.menu, ctrl('M'), MC_CHOICE); + menu_add_binding(sparms->keys.menu, ctrl('J'), MC_CHOICE); + setbitn(KM_SEL_KEY, sparms->keys.bitmap); + clrbitn(KM_ALTVIEW_KEY, sparms->keys.bitmap); + clrbitn(KM_EXPORT_KEY, sparms->keys.bitmap); + clrbitn(KM_IMPORT_KEY, sparms->keys.bitmap); } else{ sparms->keys.menu->keys[FC_SEL_KEY].name = "S"; diff --git a/pith/pine.hlp b/pith/pine.hlp index d8d4075d..c3a0973d 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -260,6 +260,10 @@ Bugs addressed include: debug level is set to 1. Print this if requested, regardless of what the default debug level is. +<LI> When trying to select a folder for saving a message, one can only enter + a subfolder by pressing the ">" command, rather than the normal + navigation by pressing "Return". Reported by Ulf-Dietrich Braunmann. + </UL> <P> Version 2.24 adds new features and addresses bugs found in previous |