diff options
| author | sabetts <sabetts> | 2003-08-11 00:15:12 +0000 |
|---|---|---|
| committer | sabetts <sabetts> | 2003-08-11 00:15:12 +0000 |
| commit | 8333d4f665d9294bb9a554e9b165207bbce9e8ce (patch) | |
| tree | 4836ea7bd1f64be5ecb66db9cd9e0cc022f5549a | |
| parent | 34dd647431e988910eb373f30e81ab252afc99b5 (diff) | |
| download | ratpoison-8333d4f665d9294bb9a554e9b165207bbce9e8ce.zip | |
(editor_enter): return EDIT_ABORT if there was an
error with the history retrieval.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/editor.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2003-08-10 Shawn Betts <sabetts@sfu.ca> + * src/editor.c (editor_enter): return EDIT_ABORT if there was an + error with the history retrieval. + * src/bar.c (get_mark_box): take the bar padding into account when calculate the top of the highlight bar. (prepare_bar): just use height for the height of the window. diff --git a/src/editor.c b/src/editor.c index a16b497..1a76170 100644 --- a/src/editor.c +++ b/src/editor.c @@ -67,7 +67,6 @@ static edit_binding edit_bindings[] = {{XK_k, RP_CONTROL_MASK}, editor_kill_line}, {{XK_u, RP_CONTROL_MASK}, editor_backward_kill_line}, {{XK_y, RP_CONTROL_MASK}, editor_paste_selection}, - {{XK_Insert, 0}, editor_paste_selection}, {{XK_p, RP_CONTROL_MASK}, editor_history_previous}, {{XK_Up, 0}, editor_history_previous}, {{XK_n, RP_CONTROL_MASK}, editor_history_next}, @@ -424,7 +423,7 @@ editor_enter (rp_input_line *line) { marked_message_printf (0, 0, " %s ", expansion); free (expansion); - line->buffer = NULL; + return EDIT_ABORT; } else /* result == 0 || result == 1 */ { |