From 71f26a68137675c79e7caada6c5403e5a729f00b Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 23 Mar 2019 18:07:32 -0700 Subject: [PATCH] Remove INPUT_COMMON_BASE We no longer store readline commands as characters, so there's no need to reserve character space for them. --- src/common.cpp | 3 +-- src/common.h | 2 -- src/input_common.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common.cpp b/src/common.cpp index b50bcac37..d097f5844 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -2382,8 +2382,7 @@ char **make_null_terminated_array(const std::vector &lst) { // TODO: Actually implement the replacement as documented above. bool fish_reserved_codepoint(wchar_t c) { return (c >= RESERVED_CHAR_BASE && c < RESERVED_CHAR_END) || - (c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END) || - (c >= INPUT_COMMON_BASE && c < INPUT_COMMON_END); + (c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END); } /// Reopen stdin, stdout and/or stderr on /dev/null. This is invoked when we find that our tty has diff --git a/src/common.h b/src/common.h index e84edaa50..cf6963349 100644 --- a/src/common.h +++ b/src/common.h @@ -87,8 +87,6 @@ typedef std::vector wcstring_list_t; // on Mac OS X. See http://www.unicode.org/faq/private_use.html. #define ENCODE_DIRECT_BASE (wchar_t)0xF600 #define ENCODE_DIRECT_END (ENCODE_DIRECT_BASE + 256) -#define INPUT_COMMON_BASE (wchar_t)0xF700 -#define INPUT_COMMON_END (INPUT_COMMON_BASE + 64) // NAME_MAX is not defined on Solaris #if !defined(NAME_MAX) diff --git a/src/input_common.h b/src/input_common.h index 27ad36d98..7489f0e96 100644 --- a/src/input_common.h +++ b/src/input_common.h @@ -10,7 +10,7 @@ #include "maybe.h" enum class readline_cmd_t { - beginning_of_line = INPUT_COMMON_BASE, + beginning_of_line, end_of_line, forward_char, backward_char,