From a3b497b271fd65a7d823a5e17d76fa2b3e2ed5fd Mon Sep 17 00:00:00 2001 From: Jan Kanis Date: Tue, 22 Jan 2013 11:25:17 +0100 Subject: [PATCH] rename reader_data_t.interruptible to exit_on_interrupt --- builtin.cpp | 2 +- reader.cpp | 10 +++++----- reader.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin.cpp b/builtin.cpp index 3307431fb..70cb94a24 100644 --- a/builtin.cpp +++ b/builtin.cpp @@ -2399,7 +2399,7 @@ static int builtin_read(parser_t &parser, wchar_t **argv) } /* No autosuggestions in builtin_read */ reader_set_allow_autosuggesting(false); - reader_set_interruptible(true); + reader_set_exit_on_interrupt(true); reader_set_buffer(commandline, wcslen(commandline)); proc_push_interactive(1); diff --git a/reader.cpp b/reader.cpp index 4e2685f17..6b778eb5f 100644 --- a/reader.cpp +++ b/reader.cpp @@ -324,7 +324,7 @@ public: bool screen_reset_needed; /** Whether the reader should exit on ^C. */ - bool interruptible; + bool exit_on_interrupt; /** Constructor */ reader_data_t() : @@ -343,7 +343,7 @@ public: search_mode(0), repaint_needed(0), screen_reset_needed(0), - interruptible(0) + exit_on_interrupt(0) { } }; @@ -656,7 +656,7 @@ int reader_interrupted() int reader_reading_interrupted() { int res = reader_interrupted(); - if (res && data && data->interruptible) + if (res && data && data->exit_on_interrupt) { reader_exit(1, 0); parser_t::skip_all_blocks(); @@ -2404,9 +2404,9 @@ void reader_set_test_function(int (*f)(const wchar_t *)) data->test_func = f; } -void reader_set_interruptible(bool i) +void reader_set_exit_on_interrupt(bool i) { - data->interruptible = i; + data->exit_on_interrupt = i; } void reader_import_history_if_necessary(void) diff --git a/reader.h b/reader.h index 0c10fb695..0942bad08 100644 --- a/reader.h +++ b/reader.h @@ -197,7 +197,7 @@ void reader_set_right_prompt(const wcstring &prompt); void reader_set_allow_autosuggesting(bool flag); /** Sets whether the reader should exit on ^C. */ -void reader_set_interruptible(bool flag); +void reader_set_exit_on_interrupt(bool flag); /** Returns true if the shell is exiting, 0 otherwise.