Light mode as default, options changed

-d is to show detail mode
-H is to show hidden files
-l is retired

diff --git a/README.md b/README.md
index df705cfe80fffee912778625610a16c943fabc5b..b4c9671c29e0f30b1eaea1a7e50e393bbb7adce6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -242,7 +242,7 @@ Option completion scripts for Bash, Fish and Zsh can be found in respective subd
 #### Cmdline options
 
 ```
-usage: nnn [-b key] [-d] [-e] [-i] [-l] [-n]
+usage: nnn [-b key] [-d] [-e] [-H] [-i] [-n]
            [-p file] [-s] [-S] [-v] [-w] [-h] [PATH]
 
 The missing terminal file manager for X.
@@ -252,10 +252,10 @@ positional args:
 
 optional args:
  -b key  open bookmark key
- -d      show hidden files
+ -d      detail mode
  -e      use exiftool for media info
+ -H      show hidden files
  -i      nav-as-you-type mode
- -l      light mode
  -n      version sort
  -p file selection file (stdout if '-')
  -s      string filters [default: regex]

diff --git a/nnn.1 b/nnn.1
index aa400d6d85cc238bd1bdbd2fdad0fc729a267b10..9b49d966a7a8892200996e77eda5905f2fccbb90 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -9,8 +9,8 @@
 .Op Ar -b key
 .Op Ar -d
 .Op Ar -e
+.Op Ar -H
 .Op Ar -i
-.Op Ar -l
 .Op Ar -n
 .Op Ar -p file
 .Op Ar -s
@@ -41,17 +41,17 @@ supports the following options:
         specify bookmark key to open
 .Pp
 .Fl d
-        show hidden files
+        detail mode
 .Pp
 .Fl e
         use exiftool instead of mediainfo
 .Pp
+.Fl H
+        show hidden files
+.Pp
 .Fl i
         start in navigate-as-you-type mode
 .Pp
-.Fl l
-        start in light mode (fewer details)
-.Pp
 .Fl n
         use case-insensitive version compare to sort files
 .Pp

diff --git a/src/nnn.c b/src/nnn.c
index f7b9ae5edff527cc3d01c9bd3d3c427ad1b6fbf3..808eaf619d33226b69dae3fcf9a53cd18fc5b53c 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -254,7 +254,7 @@ static settings cfg = {
        0, /* extnorder */
        0, /* showhidden */
        0, /* copymode */
-       1, /* showdetail */
+       0, /* showdetail */
        1, /* ctxactive */
        0, /* reserved */
        0, /* curctx */
@@ -2417,7 +2417,7 @@ static void printent_long(const struct entry *ent, int sel, uint namecols)
                attroff(A_REVERSE);
 }
 
-static void (*printptr)(const struct entry *ent, int sel, uint namecols) = &printent_long;
+static void (*printptr)(const struct entry *ent, int sel, uint namecols) = &printent;
 
 static void savecurctx(settings *curcfg, char *path, char *curname, int r /* next context num */)
 {
@@ -4504,17 +4504,17 @@ nochange:
 static void usage(void)
 {
        fprintf(stdout,
-               "%s: nnn [-b key] [-d] [-e] [-i] [-l] [-n]\n"
+               "%s: nnn [-b key] [-d] [-e] [-H] [-i] [-n]\n"
                "           [-p file] [-s] [-S] [-v] [-w] [-h] [PATH]\n\n"
                "The missing terminal file manager for X.\n\n"
                "positional args:\n"
                "  PATH   start dir [default: current dir]\n\n"
                "optional args:\n"
                " -b key  open bookmark key\n"
-               " -d      show hidden files\n"
+               " -d      detail mode\n"
                " -e      use exiftool for media info\n"
+               " -H      show hidden files\n"
                " -i      nav-as-you-type mode\n"
-               " -l      light mode\n"
                " -n      version sort\n"
                " -p file selection file (stdout if '-')\n"
                " -s      string filters [default: regex]\n"
@@ -4649,16 +4649,16 @@ int main(int argc, char *argv[])
        char *arg = NULL;
        int opt;
 
-       while ((opt = getopt(argc, argv, "Slib:denp:svwh")) != -1) {
+       while ((opt = getopt(argc, argv, "HSib:denp:svwh")) != -1) {
                switch (opt) {
                case 'S':
                        cfg.blkorder = 1;
                        nftw_fn = sum_bsizes;
                        BLK_SHIFT = ffs(S_BLKSIZE) - 1;
                        break;
-               case 'l':
-                       cfg.showdetail = 0;
-                       printptr = &printent;
+               case 'd':
+                       cfg.showdetail = 1;
+                       printptr = &printent_long;
                        break;
                case 'i':
                        cfg.filtermode = 1;
@@ -4666,12 +4666,12 @@ int main(int argc, char *argv[])
                case 'b':
                        arg = optarg;
                        break;
-               case 'd':
-                       cfg.showhidden = 1;
-                       break;
                case 'e':
                        cfg.metaviewer = EXIFTOOL;
                        break;
+               case 'H':
+                       cfg.showhidden = 1;
+                       break;
                case 'n':
                        cmpfn = &xstrverscasecmp;
                        break;