X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.c;h=a32ed4d0ef6aad2cbea1804d38fa683c2c780113;hb=53ca11ee44f71ed056f72df9769ca93b9a35e1a7;hp=b7601b9c5a372641b148ddcd16511bcbaf02913d;hpb=1c6ed48bd3cd471dc6e4613ede9151631e19f55a;p=libguestfs.git

diff --git a/fish/fish.c b/fish/fish.c
index b7601b9..a32ed4d 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -65,8 +65,10 @@ static void script (int prompt);
 static void cmdline (char *argv[], int optind, int argc);
 static void initialize_readline (void);
 static void cleanup_readline (void);
+#ifdef HAVE_LIBREADLINE
 static void add_history_line (const char *);
-static int print_shell_quote (FILE *stream, const char *str);
+#endif
+static void print_shell_quote (FILE *stream, const char *str);
 
 /* Currently open libguestfs handle. */
 guestfs_h *g;
@@ -1091,7 +1093,7 @@ display_builtin_command (const char *cmd)
               "    This is used to edit a file.\n"
               "\n"
               "    It is the equivalent of (and is implemented by)\n"
-              "    running \"cat\", editing locally, and then \"write-file\".\n"
+              "    running \"cat\", editing locally, and then \"write\".\n"
               "\n"
               "    Normally it uses $EDITOR, but if you use the aliases\n"
               "    \"vi\" or \"emacs\" you will get those editors.\n"
@@ -1443,14 +1445,14 @@ cleanup_readline (void)
 #endif
 }
 
+#ifdef HAVE_LIBREADLINE
 static void
 add_history_line (const char *line)
 {
-#ifdef HAVE_LIBREADLINE
   add_history (line);
   nr_history_lines++;
-#endif
 }
+#endif
 
 int
 xwrite (int fd, const void *v_buf, size_t len)