Renaming a variable to better indicate booleanness.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5779 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 3fc59b9fa8542333af34e7d458b67274e9e72ea3..4b8e11898cc2403a66ff43405fa67a92069c6e53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
        * src/winio.c (do_replace_highlight): Rename this to 'spotlight',
        for clarity, and for contrast with 'do_replace/do_replace_loop'.
        * src/winio.c (spotlight): Rename a variable for clarity.
+       * src/files.c (input_tab), src/prompt.c (get_prompt_string):
+       Rename a variable to better indicate booleanness.
 
 2016-03-29  Benno Schulenberg  <bensberg@justemail.net>
        * src/nano.c (main), src/text.c (do_justify, do_verbatim_input),

diff --git a/src/files.c b/src/files.c
index 991050b088c84464eacd2837b960c93ac3b38bdc..b951df58a964800644e587e6564128a2a3effb9e 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2793,15 +2793,15 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
  * position should be advanced.  refresh_func is the function we will
  * call to refresh the edit window. */
 char *input_tab(char *buf, bool allow_files, size_t *place, bool
-       *lastwastab, void (*refresh_func)(void), bool *list)
+       *lastwastab, void (*refresh_func)(void), bool *listed)
 {
     size_t num_matches = 0, buf_len;
     char **matches = NULL;
 
     assert(buf != NULL && place != NULL && *place <= strlen(buf) &&
-               lastwastab != NULL && refresh_func != NULL && list != NULL);
+               lastwastab != NULL && refresh_func != NULL && listed != NULL);
 
-    *list = FALSE;
+    *listed = FALSE;
 
     /* If the word starts with `~' and there is no slash in the word,
      * then try completing this word as a username. */
@@ -2939,7 +2939,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
            }
 
            wnoutrefresh(edit);
-           *list = TRUE;
+           *listed = TRUE;
        }
 
        free(mzero);
@@ -2949,7 +2949,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 
     /* Only refresh the edit window if we don't have a list of filename
      * matches on it. */
-    if (!*list)
+    if (!*listed)
        refresh_func();
 
     return buf;

diff --git a/src/prompt.c b/src/prompt.c
index dc3f614afa9016612e5474eb8e98cd07b2199ebf..d5003fde0ca3f606b7f4d1ad479a6210982b76e4 100644 (file)
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -527,8 +527,7 @@ void update_bar_if_needed(void)
 /* Get a string of input at the statusbar prompt. */
 functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 #ifndef DISABLE_TABCOMP
-       bool allow_files,
-       bool *list,
+       bool allow_files, bool *listed,
 #endif
        const char *curranswer,
 #ifndef DISABLE_HISTORIES
@@ -618,7 +617,7 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 #endif
            if (allow_tabs)
                answer = input_tab(answer, allow_files, &statusbar_x,
-                                  &tabbed, refresh_func, list);
+                                  &tabbed, refresh_func, listed);
 
            update_the_statusbar();
        } else
@@ -742,7 +741,7 @@ int do_prompt(bool allow_tabs,
     int retval;
     functionptrtype func;
 #ifndef DISABLE_TABCOMP
-    bool list = FALSE;
+    bool listed = FALSE;
 #endif
 
     prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1);
@@ -756,8 +755,7 @@ int do_prompt(bool allow_tabs,
 
     func = get_prompt_string(&retval, allow_tabs,
 #ifndef DISABLE_TABCOMP
-       allow_files,
-       &list,
+                       allow_files, &listed,
 #endif
        curranswer,
 #ifndef DISABLE_HISTORIES
@@ -791,7 +789,7 @@ int do_prompt(bool allow_tabs,
     /* If we've done tab completion, there might be a list of filename
      * matches on the edit window at this point.  Make sure that they're
      * cleared off. */
-    if (list)
+    if (listed)
        refresh_func();
 #endif
 

diff --git a/src/proto.h b/src/proto.h
index 17f0f4abc407f794abf1297377664dc1e456a2f1..d131ef6427aa3fdd4bafa3b2f2c4b04f86176ce6 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -341,7 +341,7 @@ char **username_tab_completion(const char *buf, size_t *num_matches,
 char **cwd_tab_completion(const char *buf, bool allow_files, size_t
        *num_matches, size_t buf_len);
 char *input_tab(char *buf, bool allow_files, size_t *place, bool
-       *lastwastab, void (*refresh_func)(void), bool *list);
+       *lastwastab, void (*refresh_func)(void), bool *listed);
 #endif
 const char *tail(const char *foo);
 #ifndef DISABLE_HISTORIES
@@ -532,8 +532,7 @@ void update_the_statusbar(void);
 void update_bar_if_needed(void);
 functionptrtype get_prompt_string(int *value, bool allow_tabs,
 #ifndef DISABLE_TABCOMP
-       bool allow_files,
-       bool *list,
+       bool allow_files, bool *listed,
 #endif
        const char *curranswer,
 #ifndef DISABLE_HISTORIES