diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2020-06-28 14:06:25 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2020-06-28 14:06:25 -0600 |
| commit | 8140a5ad34cd4545d87314a94a00a2b660fc441a (patch) | |
| tree | 99cc9088ae5fbf79e793f73bc4e008ff550c345c | |
| parent | b19b4d666223723ff5406efe042daad899f2b9a1 (diff) | |
| download | alpine-8140a5ad34cd4545d87314a94a00a2b660fc441a.tar.xz | |
* After returning from the directory side of a dual-folder, sometimes
Alpine would return to the first folder in the parent directory or to
the dual-folder. The fix is to return to the original dual-folder as
intended. Reported by Holger Trapp.
| -rw-r--r-- | alpine/folder.c | 6 | ||||
| -rw-r--r-- | pith/pine.hlp | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/alpine/folder.c b/alpine/folder.c index 7f33238d..a391181a 100644 --- a/alpine/folder.c +++ b/alpine/folder.c @@ -3526,8 +3526,12 @@ folder_lister_parent(FSTATE_S *fs, CONTEXT_S *context, int index, int force_pare folder_select_preserve(context); oldir[0] = '\0'; if((s = strrindex(context->dir->ref, context->dir->delim)) != NULL){ + char *u, *v; *s = '\0'; - if((s = strrindex(context->dir->ref, context->dir->delim)) != NULL){ + u = strrindex(context->dir->ref, context->dir->delim); + v = strrindex(context->dir->ref, '}'); + s = u < v ? v : u; + if(s != NULL){ strncpy(oldir, s+1, sizeof(oldir)-1); oldir[sizeof(oldir)-1] = '\0'; } diff --git a/pith/pine.hlp b/pith/pine.hlp index 45e43010..cdd0cae6 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 465 2020-06-28 03:00:38 +Alpine Commit 466 2020-06-28 14:06:09 ============= h_news ================= <HTML> <HEAD> @@ -211,6 +211,11 @@ Bugs addressed: <LI> Invalid signatures created by Alpine, when built with recent releases of the Openssl-1.1.1 series (but not in the Openssl-1.0.1 series). Fix contributed by Bernd Edlinger. + +<LI> After returning from the directory side of a dual-folder, sometimes + Alpine would return to the first folder in the parent directory or to + the dual-folder. The fix is to return to the original dual-folder as + intended. Reported by Holger Trapp. </UL> <P> |