Rename COPY macros to SEL

diff --git a/src/nnn.c b/src/nnn.c
index a80848eed5baeef478be3f6b18a1a496fab2cc76..db98d12b34be75ba9a037dbf8b41fba40e0575f3 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -3954,7 +3954,7 @@ nochange:
                        /* Repopulate as directory content may have changed */
                        goto begin;
                }
-               case SEL_COPY:
+               case SEL_SEL:
                        if (!ndents)
                                goto nochange;
 
@@ -4002,7 +4002,7 @@ nochange:
                                dents[cur].flags |= FILE_COPIED;
                        }
                        break;
-               case SEL_COPYMUL:
+               case SEL_SELMUL:
                        cfg.copymode ^= 1;
                        if (cfg.copymode) {
                                if (copybufpos) {
@@ -4033,8 +4033,8 @@ nochange:
                                } else
                                        copyendid = cur;
                        } // fallthrough
-               case SEL_COPYALL:
-                       if (sel == SEL_COPYALL) {
+               case SEL_SELALL:
+                       if (sel == SEL_SELALL) {
                                if (!ndents)
                                        goto nochange;
 
@@ -4045,7 +4045,7 @@ nochange:
                                copyendid = ndents - 1;
                        }
 
-                       if ((!ncp && copystartid < copyendid) || sel == SEL_COPYALL) {
+                       if ((!ncp && copystartid < copyendid) || sel == SEL_SELALL) {
                                for (r = copystartid; r <= copyendid; ++r) {
                                        appendfpath(newpath, mkpath(path, dents[r].name, newpath));
                                        dents[r].flags |= FILE_COPIED;
@@ -4069,7 +4069,7 @@ nochange:
                                goto nochange;
                        }
                        continue;
-               case SEL_COPYLIST:
+               case SEL_SELLST:
                        if (showcplist() || showcpfile()) {
                                if (cfg.filtermode)
                                        presel = FILTER;

diff --git a/src/nnn.h b/src/nnn.h
index f6d71479a91a00ce0e04d218c57ca28dc70ca6e3..262cc4e578f194ffeb3898accf104a41a5c56b42 100644 (file)
--- a/src/nnn.h
+++ b/src/nnn.h
@@ -76,10 +76,10 @@ enum action {
        SEL_MTIME,
        SEL_WILD,
        SEL_REDRAW,
-       SEL_COPY,
-       SEL_COPYMUL,
-       SEL_COPYALL,
-       SEL_COPYLIST,
+       SEL_SEL,
+       SEL_SELMUL,
+       SEL_SELALL,
+       SEL_SELLST,
        SEL_CP,
        SEL_MV,
        SEL_RMMUL,
@@ -203,15 +203,15 @@ static struct key bindings[] = {
        /* Redraw window */
        { CONTROL('L'),   SEL_REDRAW },
        /* Copy currently selected file path */
-       { CONTROL('K'),   SEL_COPY },
-       { ' ',            SEL_COPY },
+       { CONTROL('K'),   SEL_SEL },
+       { ' ',            SEL_SEL },
        /* Toggle copy multiple file paths */
-       { 'K',            SEL_COPYMUL },
-       { CONTROL('Y'),   SEL_COPYMUL },
+       { 'K',            SEL_SELMUL },
+       { CONTROL('Y'),   SEL_SELMUL },
        /* Select all files in current dir */
-       { 'Y',            SEL_COPYALL },
+       { 'Y',            SEL_SELALL },
        /* Show list of copied files */
-       { 'y',            SEL_COPYLIST },
+       { 'y',            SEL_SELLST },
        /* Copy from copy buffer */
        { 'P',            SEL_CP },
        /* Move from copy buffer */