4 files changed, 9 insertions, 7 deletions
diff --git a/src/conf.c b/src/conf.c
index 6d5c841..4abee83 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -75,7 +75,7 @@ void store_default_config_values() {
     put(user_conf_d, "quit_afterload", "0");
     put(user_conf_d, "numeric_zero", "1");
     put(user_conf_d, "numeric_decimal", "1");
-    put(user_conf_d, "filename_in_status", "0");
+    put(user_conf_d, "filename_with_mode", "0");
     put(user_conf_d, "overlap", "0");
     put(user_conf_d, "truncate", "0");
     put(user_conf_d, "debug", "0");
diff --git a/src/doc b/src/doc
index 96fe743..f05f87a 100755
--- a/src/doc
+++ b/src/doc
@@ -1092,7 +1092,7 @@ Commands for handling cell content:
     Disabled by default, set this variable to enable external functions.  See
     @ext function below.
 
-    'filename_in_status' [default 0]
+    'filename_with_mode' [default 0]
     Set it to '1' to display current filename along with the current mode at
     the right end of the status line.
     Set it to '0', to display the current mode only.
diff --git a/src/gram.y b/src/gram.y
index 0806441..a412e19 100755
--- a/src/gram.y
+++ b/src/gram.y
@@ -234,7 +234,8 @@ token S_YANKCOL
 %token K_NONUMERIC_DECIMAL
 %token K_NUMERIC_ZERO
 %token K_NONUMERIC_ZERO
-%token K_FILENAME_IN_STATUS
+%token K_FILENAME_WITH_MODE
+%token K_NOFILENAME_WITH_MODE
 %token K_OVERLAP
 %token K_NOOVERLAP
 %token K_TRUNCATE
@@ -1046,9 +1047,10 @@ setlist :
 
 /* things that you can 'set' */
 setitem :
-         K_FILENAME_IN_STATUS '=' NUMBER {  if ($3 == 0) parse_str(user_conf_d, "filename_in_status=0", TRUE);
-                                     else         parse_str(user_conf_d, "filename_in_status=1", TRUE); }
-    |    K_FILENAME_IN_STATUS     {               parse_str(user_conf_d, "filename_in_status=1", TRUE); }
+         K_FILENAME_WITH_MODE '=' NUMBER {  if ($3 == 0) parse_str(user_conf_d, "filename_with_mode=0", TRUE);
+                                     else         parse_str(user_conf_d, "filename_with_mode=1", TRUE); }
+    |    K_FILENAME_WITH_MODE     {               parse_str(user_conf_d, "filename_with_mode=1", TRUE); }
+    |    K_NOFILENAME_WITH_MODE   {               parse_str(user_conf_d, "filename_with_mode=0", TRUE); }
 
     |    K_OVERLAP '=' NUMBER     {  if ($3 == 0) parse_str(user_conf_d, "overlap=0", TRUE);
                                      else         parse_str(user_conf_d, "overlap=1", TRUE); }
diff --git a/src/tui.c b/src/tui.c
index 5a5b799..6b40f81 100644
--- a/src/tui.c
+++ b/src/tui.c
@@ -573,7 +573,7 @@ void ui_print_mode() {
     #endif
 
     strm[0] = '\0';
-    if (atoi(get_conf_value("filename_in_status")) && curfile[0]) {
+    if (atoi(get_conf_value("filename_with_mode")) && curfile[0]) {
         sprintf(strm, "%s ", curfile);
     }