summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--command.c6
-rw-r--r--command.y6
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e6b3ea63..b763a7ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-07 Arnold D. Robbins <arnold@skeeve.com>
+
+ * command.y (next_word): Move into ifdef for HAVE_LIBREADLINE,
+ since it's only used by that code.
+
2014-01-03 Arnold D. Robbins <arnold@skeeve.com>
* config.guess, config.rpath, config.sub, depcomp,
diff --git a/command.c b/command.c
index d170e4c1..91a8335e 100644
--- a/command.c
+++ b/command.c
@@ -99,10 +99,10 @@ static bool in_eval = false;
static const char start_EVAL[] = "function @eval(){";
static const char end_EVAL[] = "}";
static CMDARG *append_statement(CMDARG *stmt_list, char *stmt);
-static char *next_word(char *p, int len, char **endp);
static NODE *concat_args(CMDARG *a, int count);
#ifdef HAVE_LIBREADLINE
+static char *next_word(char *p, int len, char **endp);
static void history_expand_line(char **line);
static char *command_generator(const char *text, int state);
static char *srcfile_generator(const char *text, int state);
@@ -3395,6 +3395,8 @@ do_help(CMDARG *arg, int cmd)
}
+#ifdef HAVE_LIBREADLINE
+
/* next_word --- find the next word in a line to complete
* (word seperation characters are space and tab).
*/
@@ -3421,8 +3423,6 @@ next_word(char *p, int len, char **endp)
return p;
}
-#ifdef HAVE_LIBREADLINE
-
/* command_completion --- attempt to complete based on the word number in line;
* try to complete on command names if this is the first word; for the next
* word(s), the type of completion depends on the command name (first word).
diff --git a/command.y b/command.y
index f6c79812..acf4a602 100644
--- a/command.y
+++ b/command.y
@@ -51,10 +51,10 @@ static bool in_eval = false;
static const char start_EVAL[] = "function @eval(){";
static const char end_EVAL[] = "}";
static CMDARG *append_statement(CMDARG *stmt_list, char *stmt);
-static char *next_word(char *p, int len, char **endp);
static NODE *concat_args(CMDARG *a, int count);
#ifdef HAVE_LIBREADLINE
+static char *next_word(char *p, int len, char **endp);
static void history_expand_line(char **line);
static char *command_generator(const char *text, int state);
static char *srcfile_generator(const char *text, int state);
@@ -1459,6 +1459,8 @@ do_help(CMDARG *arg, int cmd)
}
+#ifdef HAVE_LIBREADLINE
+
/* next_word --- find the next word in a line to complete
* (word seperation characters are space and tab).
*/
@@ -1485,8 +1487,6 @@ next_word(char *p, int len, char **endp)
return p;
}
-#ifdef HAVE_LIBREADLINE
-
/* command_completion --- attempt to complete based on the word number in line;
* try to complete on command names if this is the first word; for the next
* word(s), the type of completion depends on the command name (first word).