summaryrefslogtreecommitdiff
path: root/src/editor.c
diff options
context:
space:
mode:
authorsabetts <sabetts>2004-09-29 15:33:13 +0000
committersabetts <sabetts>2004-09-29 15:33:13 +0000
commit442b8d1ae2f4419ca2e2e4d76ad06ae38d18d1c7 (patch)
tree0f8560315ca338841e8d70fbcff55ad995dbbe61 /src/editor.c
parent6206d6ac617f244700cebb319fd9e53636cfbd83 (diff)
downloadratpoison-442b8d1ae2f4419ca2e2e4d76ad06ae38d18d1c7.zip
* configure.in: Warn when the history header or library is not
found and compile without history support. * src/ratpoison.h: change ifdef to check for HAVE_HISTORY. * src/manage.c (get_state): change data to an unsigned char and cast data to a long* when it's used. * src/main.c (main): change ifdef to check for HAVE_HISTORY. (clean_up): likewise * src/history.c: change ifdef to check for HAVE_HISTORY. * src/events.c (receive_command): make prop_return an unsigned char. * src/editor.c (editor_history_previous): change ifdef to check for HAVE_HISTORY. (editor_history_next): likewise (editor_enter): likewise
Diffstat (limited to 'src/editor.c')
-rw-r--r--src/editor.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/editor.c b/src/editor.c
index 4864e80..c5c3560 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -309,7 +309,7 @@ editor_backward_kill_line (rp_input_line *line)
static edit_status
editor_history_previous (rp_input_line *line)
{
-#ifdef HAVE_READLINE_HISTORY_H
+#ifdef HAVE_HISTORY
char *entry = history_previous ();
if (entry)
@@ -336,17 +336,17 @@ editor_history_previous (rp_input_line *line)
return EDIT_INSERT;
-#else /* HAVE_READLINE_HISTORY_H */
+#else /* HAVE_HISTORY */
return EDIT_NO_OP;
-#endif /* HAVE_READLINE_HISTORY_H */
+#endif /* HAVE_HISTORY */
}
static edit_status
editor_history_next (rp_input_line *line)
{
-#ifdef HAVE_READLINE_HISTORY_H
+#ifdef HAVE_HISTORY
char *entry = history_next ();
if (entry)
@@ -374,9 +374,9 @@ editor_history_next (rp_input_line *line)
return EDIT_INSERT;
-#else /* HAVE_READLINE_HISTORY_H */
+#else /* HAVE_HISTORY */
return EDIT_NO_OP;
-#endif /* HAVE_READLINE_HISTORY_H */
+#endif /* HAVE_HISTORY */
}
static edit_status
@@ -426,7 +426,7 @@ editor_enter (rp_input_line *line)
char *expansion;
line->buffer[line->length] = '\0';
-#ifdef HAVE_READLINE_HISTORY_H
+#ifdef HAVE_HISTORY
result = history_expand_line (line->buffer, &expansion);
PRINT_DEBUG (("History Expansion - result: %d\n", result));
@@ -443,7 +443,7 @@ editor_enter (rp_input_line *line)
history_add (expansion);
line->buffer = expansion;
}
-#endif /* HAVE_READLINE_HISTORY_H */
+#endif /* HAVE_HISTORY */
return EDIT_DONE;
}