mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 20:33:08 +00:00
a make style-all
cleanup
This commit is contained in:
parent
5e2c14e7be
commit
0dc92fbb2d
5 changed files with 14 additions and 16 deletions
|
@ -46,7 +46,8 @@ function cdh --description "Menu based cd command"
|
|||
for i in (seq $dirc -1 1)
|
||||
set -l dir $uniq_dirs[$i]
|
||||
set -l label_color normal
|
||||
set -q fish_color_cwd; and set label_color $fish_color_cwd
|
||||
set -q fish_color_cwd
|
||||
and set label_color $fish_color_cwd
|
||||
set -l dir_color_reset (set_color normal)
|
||||
set -l dir_color
|
||||
if test "$dir" = "$PWD"
|
||||
|
@ -57,8 +58,7 @@ function cdh --description "Menu based cd command"
|
|||
if set -q home_dir[2]
|
||||
set dir "~$home_dir[2]"
|
||||
end
|
||||
printf '%s %s %2d) %s %s%s%s\n' (set_color $label_color) $letters[$i] \
|
||||
$i (set_color normal) $dir_color $dir $dir_color_reset
|
||||
printf '%s %s %2d) %s %s%s%s\n' (set_color $label_color) $letters[$i] $i (set_color normal) $dir_color $dir $dir_color_reset
|
||||
end
|
||||
|
||||
# Ask the user which directory from their history they want to cd to.
|
||||
|
|
|
@ -639,8 +639,7 @@ static void set_argparse_result_vars(argparse_cmd_opts_t &opts) {
|
|||
for (size_t pos = 0; pos < long_flag.size(); pos++) {
|
||||
if (!iswalnum(long_flag[pos])) long_flag[pos] = L'_';
|
||||
}
|
||||
env_set(var_name_prefix + long_flag, *val == ENV_NULL ? NULL : val->c_str(),
|
||||
ENV_LOCAL);
|
||||
env_set(var_name_prefix + long_flag, *val == ENV_NULL ? NULL : val->c_str(), ENV_LOCAL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -60,14 +60,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|||
|
||||
// container to hold the options specified within the command line
|
||||
class fish_cmd_opts_t {
|
||||
public:
|
||||
public:
|
||||
// Commands to be executed in place of interactive shell.
|
||||
std::vector<std::string> batch_cmds;
|
||||
// Commands to execute after the shell's config has been read.
|
||||
std::vector<std::string> postconfig_cmds;
|
||||
};
|
||||
|
||||
|
||||
/// If we are doing profiling, the filename to output to.
|
||||
static const char *s_profiling_output_filename = NULL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue