github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-19 22:22:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove INPUT_COMMON_BASE

Browse Source 
We no longer store readline commands as characters, so there's no need to
reserve character space for them.
This commit is contained in:
ridiculousfish 2019-03-23 18:07:32 -07:00
parent e7d7eff0ee
commit 71f26a6813
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common.cpp
View File

@ -2382,8 +2382,7 @@ char **make_null_terminated_array(const std::vector<std::string> &lst) {
// TODO: Actually implement the replacement as documented above. // TODO: Actually implement the replacement as documented above.
bool fish_reserved_codepoint(wchar_t c) { bool fish_reserved_codepoint(wchar_t c) {
return (c >= RESERVED_CHAR_BASE && c < RESERVED_CHAR_END) || return (c >= RESERVED_CHAR_BASE && c < RESERVED_CHAR_END) ||
(c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END) || (c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END);
(c >= INPUT_COMMON_BASE && c < INPUT_COMMON_END);
} }
/// Reopen stdin, stdout and/or stderr on /dev/null. This is invoked when we find that our tty has /// Reopen stdin, stdout and/or stderr on /dev/null. This is invoked when we find that our tty has

2
src/common.h
View File

@ -87,8 +87,6 @@ typedef std::vector<wcstring> wcstring_list_t;
// on Mac OS X. See http://www.unicode.org/faq/private_use.html. // on Mac OS X. See http://www.unicode.org/faq/private_use.html.
#define ENCODE_DIRECT_BASE (wchar_t)0xF600 #define ENCODE_DIRECT_BASE (wchar_t)0xF600
#define ENCODE_DIRECT_END (ENCODE_DIRECT_BASE + 256) #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 // NAME_MAX is not defined on Solaris
#if !defined(NAME_MAX) #if !defined(NAME_MAX)

2
src/input_common.h
View File

@ -10,7 +10,7 @@
#include "maybe.h" #include "maybe.h"
enum class readline_cmd_t { enum class readline_cmd_t {
beginning_of_line = INPUT_COMMON_BASE, beginning_of_line,
end_of_line, end_of_line,
forward_char, forward_char,
backward_char, backward_char,