summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleo-arch <leonardoabramovich2@gmail.com>2021-06-05 19:09:24 -0300
committerleo-arch <leonardoabramovich2@gmail.com>2021-06-05 19:09:24 -0300
commitbf13131f4ebdd29eb5502aaf66a1a6baca353f68 (patch)
treef3e69ca94bf3b10d816b7802322fc59b6c0a8ef9
parent31e25774e0969f150c4b2dcc2363c6b5f7264f84 (diff)
Become non case sensitive by default
-rw-r--r--src/config.c34
-rw-r--r--src/helpers.h4
-rw-r--r--src/init.c12
-rw-r--r--src/misc.c8
4 files changed, 35 insertions, 23 deletions
diff --git a/src/config.c b/src/config.c
index d1dd8520..1f9ab95a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -780,10 +780,14 @@ mvCmd=%d\n\n"
# whenever the current path is longer than MaxPath.\n\
MaxPath=%d\n\n"
- "WelcomeMessage=%s\n\
-SplashScreen=%s\n\
-ShowHiddenFiles=%s\n\
-LongViewMode=%s\n\
+ "WelcomeMessage=%s\n\n\
+# Print %s's logo screen at startup\n\
+SplashScreen=%s\n\n\
+ShowHiddenFiles=%s\n\n\
+# List files properties next to file names instead of just file names\n\
+LongViewMode=%s\n\n\
+# Keep a record of both external commands and internal commands able to\n\
+# modify the files system (e.g. 'r', 'c', 'm', and so on)\n\
LogCmds=%s\n\n"
"# Minimum length at which a file name can be trimmed in long view mode\n\
@@ -830,6 +834,7 @@ LightMode=%s\n\n",
DEF_MAX_PATH,
DEF_WELCOME_MESSAGE == 1 ? "true" : "false",
+ PROGRAM_NAME,
DEF_SPLASH_SCREEN == 1 ? "true" : "false",
DEF_SHOW_HIDDEN == 1 ? "true" : "false",
DEF_LONG_VIEW == 1 ? "true" : "false",
@@ -881,14 +886,21 @@ Sort=%d\n\
# true (you can also use the --sort-reverse option or the 'st' command)\n\
SortReverse=%s\n\n"
- "Tips=%s\n\
+ "# Print a usage tip at startup\n\
+Tips=%s\n\n\
ListFoldersFirst=%s\n\
-CdListsAutomatically=%s\n\
-CaseSensitiveList=%s\n\
-CaseSensitiveDirJump=%s\n\
-CaseSensitivePathComp=%s\n\
-Unicode=%s\n\
-Pager=%s\n\
+CdListsAutomatically=%s\n\n\
+# Enable case senstive listing for files in the current directory\n\
+CaseSensitiveList=%s\n\n\
+# Enable case sensitive lookup for the directory jumper function (via \n\
+# the 'j' command)\n\
+CaseSensitiveDirJump=%s\n\n\
+# Enable case sensitive completion for file names\n\
+CaseSensitivePathComp=%s\n\n\
+Unicode=%s\n\n\
+# Enable Mas, the files list pager (executed whenever the list of files\n\
+# does not fit in the screen)\n\
+Pager=%s\n\n\
MaxHistory=%d\n\
MaxDirhist=%d\n\
MaxLog=%d\n\
diff --git a/src/helpers.h b/src/helpers.h
index d5cd62c2..20c8c0ff 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -296,8 +296,8 @@ nm=01;32:bm=01;36:"
#define DEF_AUTOCD 1
#define DEF_AUTO_OPEN 1
#define DEF_CASE_SENSITIVE 0
-#define DEF_CASE_SENS_DIRJUMP 1
-#define DEF_CASE_SENS_PATH_COMP 1
+#define DEF_CASE_SENS_DIRJUMP 0
+#define DEF_CASE_SENS_PATH_COMP 0
#define DEF_CD_LISTS_ON_THE_FLY 1
#define DEF_CD_ON_QUIT 0
#define DEF_CLASSIFY 1
diff --git a/src/init.c b/src/init.c
index 45a43da6..c30486df 100644
--- a/src/init.c
+++ b/src/init.c
@@ -535,7 +535,7 @@ external_arguments(int argc, char **argv)
{"no-unicode", no_argument, 0, 'u'},
{"version", no_argument, 0, 'v'},
{"workspace", required_argument, 0, 'w'},
- {"ext-cmds", no_argument, 0, 'x'},
+ {"no-ext-cmds", no_argument, 0, 'x'},
{"light", no_argument, 0, 'y'},
{"sort", required_argument, 0, 'z'},
@@ -568,8 +568,8 @@ external_arguments(int argc, char **argv)
{"no-colors", no_argument, 0, 27},
{"max-files", required_argument, 0, 28},
{"trash-as-rm", no_argument, 0, 29},
- {"case-ins-dirjump", no_argument, 0, 30},
- {"case-ins-path-comp", no_argument, 0, 31},
+ {"case-sens-dirjump", no_argument, 0, 30},
+ {"case-sens-path-comp", no_argument, 0, 31},
{"cwd-in-title", no_argument, 0, 32},
{"open", required_argument, 0, 33},
{"print-sel", no_argument, 0, 34},
@@ -723,11 +723,11 @@ external_arguments(int argc, char **argv)
break;
case 30:
- xargs.case_sens_dirjump = case_sens_dirjump = 0;
+ xargs.case_sens_dirjump = case_sens_dirjump = 1;
break;
case 31:
- xargs.case_sens_path_comp = case_sens_path_comp = 0;
+ xargs.case_sens_path_comp = case_sens_path_comp = 1;
break;
case 32:
@@ -895,7 +895,7 @@ external_arguments(int argc, char **argv)
} break;
case 'x':
- ext_cmd_ok = xargs.ext = 1;
+ ext_cmd_ok = xargs.ext = 0;
break;
case 'y':
diff --git a/src/misc.c b/src/misc.c
index 0314ff22..7ed0702c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1496,7 +1496,7 @@ help_function(void)
\n enabled by default\
\n -v, --version\t\t\t show version details and exit\
\n -w, --workspace=NUM\t\t start in workspace NUM\
-\n -x, --ext-cmds\t\t\t allow the use of external commands\
+\n -x, --no-ext-cmds\t\t\t Disallow the use of external commands\
\n -y, --light-mode\t\t enable the light mode\
\n -z, --sort=METHOD\t\t sort files by METHOD, where METHOD \
\n could be: 0 = none, 1 = name, 2 = size, \
@@ -1506,9 +1506,9 @@ help_function(void)
PNL, GRAL_USAGE, PROGRAM_NAME);
printf("\
-\n --case-ins-dirjump\t consult the jump database ignoring \
-\n case\
-\n --case-ins-path-comp\t TAB complete paths ignoring case\
+\n --case-sens-dirjump\t do not ignore case when consulting the \
+\n jump database (via the 'j' command)\
+\n --case-sens-path-comp\t enable case sensitive path completion\
\n --cd-on-quit\t\t write last visited path to \
\n $XDG_CONFIG_HOME/clifm/.last to be accessed\
\n later by a shell funtion. See the manpage\