From 749f0893559a64e6843288a646e9fc86de62d74d Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Mon, 13 Jan 2020 18:57:46 +0530 Subject: [PATCH] Key z to archive, fix du order issue --- src/nnn.c | 4 ++-- src/nnn.h | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/nnn.c b/src/nnn.c index ac7c9bbb..638aa9fc 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -3604,7 +3604,7 @@ static void show_help(const char *path) "cD File details%-12cd Detail view toggle\n" "cr Batch rename%-8cF2 ^R Rename/duplicate\n" "ce Edit in EDITOR%-10cp Open in PAGER\n" - "ci Archive entry%-11c* Toggle exe\n" + "cz Archive entry%-11c* Toggle exe\n" "5Space ^J (Un)select%-11cm ^K Select range, clear\n" "cP Copy sel here%-11ca Select all\n" "cV Move sel here%-10c^V Copy/move sel as\n" @@ -4987,7 +4987,7 @@ nochange: cfg.blkorder = 0; // fallthrough case 'd': /* Disk usage */ - if (sel == SEL_BSIZE) { + if (r == 'd') { if (!cfg.apparentsz) cfg.blkorder ^= 1; nftw_fn = &sum_bsizes; diff --git a/src/nnn.h b/src/nnn.h index a5721198..25a2f951 100644 --- a/src/nnn.h +++ b/src/nnn.h @@ -68,13 +68,6 @@ enum action { SEL_CHMODX, SEL_ARCHIVE, SEL_ORDER, - SEL_FSIZE, /* file size */ - SEL_ASIZE, /* apparent size */ - SEL_BSIZE, /* block size */ - SEL_EXTN, /* order by extension */ - SEL_MTIME, - SEL_REVERSE, - SEL_VERSION, SEL_REDRAW, SEL_SEL, SEL_SELMUL, @@ -183,7 +176,7 @@ static struct key bindings[] = { /* Toggle executable status */ { '*', SEL_CHMODX }, /* Create archive */ - { 'i', SEL_ARCHIVE }, + { 'z', SEL_ARCHIVE }, /* Order toggle */ { 'o', SEL_ORDER }, { CONTROL('T'), SEL_ORDER },