mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 05:13:10 +00:00
Always source
file after funced
(#10318)
... even if the file hasn't changed. This addresses an oddity in the following
case:
* Shell is started,
* function `foo` is sourced from foo.fish
* foo.fish is *externally* edited and saved
* <Loaded definition of `foo` is now stale, but fish is unaware>
* `funced foo` loads `type -p foo` showing changed definition, user exits
$EDITOR saving no changes (or with $status 0, more generally).
* Stale definition of `foo` remains
(cherry picked from commit 2c2ab0c1fa
)
This commit is contained in:
parent
fada4f2e01
commit
b7b20e9fac
1 changed files with 3 additions and 1 deletions
|
@ -114,7 +114,9 @@ function funced --description 'Edit function definition'
|
|||
set -l new_checksum (__funced_md5 "$tmpname")
|
||||
if test "$new_checksum" = "$checksum"
|
||||
echo (_ "Editor exited but the function was not modified")
|
||||
# Don't source or save an unmodified file.
|
||||
# Source but don't save an unmodified file.
|
||||
# (Source in case the file changed externally since we first loaded it.)
|
||||
source "$writepath"
|
||||
break
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue