pyrox.dev
1commit 5145ca56b0ac1e5e284ab6dfa6fdecc5e86e59b8
2Author: Jakob Gillich <jakob@gillich.me>
3Date: Sat Dec 26 04:57:06 2015 +0100
4
5 prefix status command with builtin
6
7diff --git a/etc/config.fish b/etc/config.fish
8index 0683f40..9297a85 100644
9--- a/etc/config.fish
10+++ b/etc/config.fish
11@@ -6,7 +6,7 @@
12 # Some things should only be done for login terminals
13 #
14
15-if status --is-login
16+if builtin status --is-login
17
18 #
19 # Set some value for LANG if nothing was set before, and this is a
20diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
21index 9b27fb9..d1c704b 100644
22--- a/share/functions/__fish_config_interactive.fish
23+++ b/share/functions/__fish_config_interactive.fish
24@@ -101,7 +101,7 @@ function __fish_config_interactive -d "Initializations that should be performed
25 eval "$__fish_bin_dir/fish -c 'fish_update_completions > /dev/null ^/dev/null' &"
26 end
27
28- if status -i
29+ if builtin status -i
30 #
31 # Print a greeting
32 #
33@@ -128,14 +128,14 @@ function __fish_config_interactive -d "Initializations that should be performed
34 #
35
36 function __fish_repaint --on-variable fish_color_cwd --description "Event handler, repaints the prompt when fish_color_cwd changes"
37- if status --is-interactive
38+ if builtin status --is-interactive
39 set -e __fish_prompt_cwd
40 commandline -f repaint ^/dev/null
41 end
42 end
43
44 function __fish_repaint_root --on-variable fish_color_cwd_root --description "Event handler, repaints the prompt when fish_color_cwd_root changes"
45- if status --is-interactive
46+ if builtin status --is-interactive
47 set -e __fish_prompt_cwd
48 commandline -f repaint ^/dev/null
49 end
50@@ -191,7 +191,7 @@ function __fish_config_interactive -d "Initializations that should be performed
51 # Notify vte-based terminals when $PWD changes (issue #906)
52 if test "$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = "Apple_Terminal"
53 function __update_vte_cwd --on-variable PWD --description 'Notify VTE of change to $PWD'
54- status --is-command-substitution; and return
55+ builtin status --is-command-substitution; and return
56 printf '\033]7;file://%s%s\a' (hostname) (pwd | __fish_urlencode)
57 end
58 end
59diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish
60index 0117894..4e4b60f 100644
61--- a/share/functions/__fish_git_prompt.fish
62+++ b/share/functions/__fish_git_prompt.fish
63@@ -728,7 +728,7 @@ for var in repaint describe_style show_informative_status showdirtystate showsta
64 set varargs $varargs --on-variable __fish_git_prompt_$var
65 end
66 function __fish_git_prompt_repaint $varargs --description "Event handler, repaints prompt when functionality changes"
67- if status --is-interactive
68+ if builtin status --is-interactive
69 if test $argv[3] = __fish_git_prompt_show_informative_status
70 # Clear characters that have different defaults with/without informative status
71 for name in cleanstate dirtystate invalidstate stagedstate stateseparator untrackedfiles upstream_ahead upstream_behind
72@@ -746,7 +746,7 @@ for var in '' _prefix _suffix _bare _merging _cleanstate _invalidstate _upstream
73 end
74 set varargs $varargs --on-variable __fish_git_prompt_showcolorhints
75 function __fish_git_prompt_repaint_color $varargs --description "Event handler, repaints prompt when any color changes"
76- if status --is-interactive
77+ if builtin status --is-interactive
78 set -l var $argv[3]
79 set -e _$var
80 set -e _{$var}_done
81@@ -766,7 +766,7 @@ for var in cleanstate dirtystate invalidstate stagedstate stashstate statesepara
82 set varargs $varargs --on-variable __fish_git_prompt_char_$var
83 end
84 function __fish_git_prompt_repaint_char $varargs --description "Event handler, repaints prompt when any char changes"
85- if status --is-interactive
86+ if builtin status --is-interactive
87 set -e _$argv[3]
88 commandline -f repaint ^/dev/null
89 end
90diff --git a/share/functions/cd.fish b/share/functions/cd.fish
91index 8faa469..10168d7 100644
92--- a/share/functions/cd.fish
93+++ b/share/functions/cd.fish
94@@ -5,7 +5,7 @@
95 function cd --description "Change directory"
96
97 # Skip history in subshells
98- if status --is-command-substitution
99+ if builtin status --is-command-substitution
100 builtin cd $argv
101 return $status
102 end
103@@ -33,4 +33,3 @@ function cd --description "Change directory"
104
105 return $cd_status
106 end
107-
108diff --git a/share/functions/eval.fish b/share/functions/eval.fish
109index 052d417..5eeb12a 100644
110--- a/share/functions/eval.fish
111+++ b/share/functions/eval.fish
112@@ -23,17 +23,17 @@ function eval -S -d "Evaluate parameters as a command"
113 # used interactively, like less, wont work using eval.
114
115 set -l mode
116- if status --is-interactive-job-control
117+ if builtin status --is-interactive-job-control
118 set mode interactive
119 else
120- if status --is-full-job-control
121+ if builtin status --is-full-job-control
122 set mode full
123 else
124 set mode none
125 end
126 end
127- if status --is-interactive
128- status --job-control full
129+ if builtin status --is-interactive
130+ builtin status --job-control full
131 end
132 __fish_restore_status $status_copy
133
134@@ -60,6 +60,6 @@ function eval -S -d "Evaluate parameters as a command"
135 echo "begin; $argv "\n" ;end <&3 3<&-" | source 3<&0
136 set -l res $status
137
138- status --job-control $mode
139+ builtin status --job-control $mode
140 return $res
141 end
142diff --git a/share/functions/history.fish b/share/functions/history.fish
143index fd2b91f..12d28d7 100644
144--- a/share/functions/history.fish
145+++ b/share/functions/history.fish
146@@ -38,7 +38,7 @@ function history --description "Deletes an item from history"
147 end
148 else
149 #Execute history builtin without any argument
150- if status --is-interactive
151+ if builtin status --is-interactive
152 builtin history | eval $pager
153 else
154 builtin history
155diff --git a/share/functions/psub.fish b/share/functions/psub.fish
156index 67863ad..dd0e08b 100644
157--- a/share/functions/psub.fish
158+++ b/share/functions/psub.fish
159@@ -40,7 +40,7 @@ function psub --description "Read from stdin into a file and output the filename
160
161 end
162
163- if not status --is-command-substitution
164+ if not builtin status --is-command-substitution
165 echo psub: Not inside of command substitution >&2
166 return 1
167 end
168diff --git a/share/tools/web_config/sample_prompts/classic_git.fish b/share/tools/web_config/sample_prompts/classic_git.fish
169index 39f3ab8..601fa19 100644
170--- a/share/tools/web_config/sample_prompts/classic_git.fish
171+++ b/share/tools/web_config/sample_prompts/classic_git.fish
172@@ -17,25 +17,25 @@ function fish_prompt --description 'Write out the prompt'
173 set -g __fish_classic_git_functions_defined
174
175 function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
176- if status --is-interactive
177+ if builtin status --is-interactive
178 commandline -f repaint ^/dev/null
179 end
180 end
181-
182+
183 function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
184- if status --is-interactive
185+ if builtin status --is-interactive
186 commandline -f repaint ^/dev/null
187 end
188 end
189-
190+
191 function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
192- if status --is-interactive
193+ if builtin status --is-interactive
194 commandline -f repaint ^/dev/null
195 end
196 end
197
198 function __fish_repaint_bind_mode --on-variable fish_key_bindings --description "Event handler; repaint when fish_key_bindings changes"
199- if status --is-interactive
200+ if builtin status --is-interactive
201 commandline -f repaint ^/dev/null
202 end
203 end
204diff --git a/tests/test_util.fish b/tests/test_util.fish
205index 22744b3..576dbc4 100644
206--- a/tests/test_util.fish
207+++ b/tests/test_util.fish
208@@ -4,7 +4,7 @@
209 if test "$argv[1]" = (status -f)
210 echo 'test_util.fish requires sourcing script as argument to `source`' >&2
211 echo 'use `source test_util.fish (status -f); or exit`' >&2
212- status --print-stack-trace >&2
213+ builtin status --print-stack-trace >&2
214 exit 1
215 end
216