github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Show -M and -m flags in bind list

Browse Source
This commit is contained in:
Kevin Ballard 2014-09-22 12:37:11 -07:00
parent e689a38663
commit 4ed4b265a5
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builtin.cpp
View File

@ -425,18 +425,34 @@ static void builtin_bind_list(const wchar_t *bind_mode)
continue; continue;
} }
// Append the initial 'bind' command and the name stdout_buffer.append(L"bind");
// Append the mode flags if applicable
if (mode != DEFAULT_BIND_MODE)
{
const wcstring emode = escape_string(mode, ESCAPE_ALL);
stdout_buffer.append(L" -M ");
stdout_buffer.append(emode);
}
if (sets_mode != mode)
{
const wcstring esets_mode = escape_string(sets_mode, ESCAPE_ALL);
stdout_buffer.append(L" -m ");
stdout_buffer.append(esets_mode);
}
// Append the name
wcstring tname; wcstring tname;
if (input_terminfo_get_name(seq, &tname)) if (input_terminfo_get_name(seq, &tname))
{ {
// Note that we show -k here because we have an input key name // Note that we show -k here because we have an input key name
append_format(stdout_buffer, L"bind -k %ls", tname.c_str()); append_format(stdout_buffer, L" -k %ls", tname.c_str());
} }
else else
{ {
// No key name, so no -k; we show the escape sequence directly // No key name, so no -k; we show the escape sequence directly
const wcstring eseq = escape_string(seq, 1); const wcstring eseq = escape_string(seq, ESCAPE_ALL);
append_format(stdout_buffer, L"bind %ls", eseq.c_str()); append_format(stdout_buffer, L" %ls", eseq.c_str());
} }
// Now show the list of commands // Now show the list of commands

2
common.h
View File

@ -805,7 +805,7 @@ void print_stderr(const wcstring &str);
replaced with \n, etc. replaced with \n, etc.
\param in The string to be escaped \param in The string to be escaped
\param escape_all Whether all characters wich hold special meaning in fish (Pipe, semicolon, etc,) should be escaped, or only unprintable characters \param flags Flags to control the escaping
\return The escaped string, or 0 if there is not enough memory \return The escaped string, or 0 if there is not enough memory
*/ */