From e7abb525263443aea6cbcea6d59022851c63eb6a Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sat, 27 Mar 2021 22:54:42 +0100 Subject: [PATCH] Remove special "default" value for $fish_history This is really of very little use and makes checking $fish_history harder because it makes two values mean the same thing. Fixes #7650 --- doc_src/language.rst | 2 +- src/history.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/doc_src/language.rst b/doc_src/language.rst index 2a3c2900a..831515bb9 100644 --- a/doc_src/language.rst +++ b/doc_src/language.rst @@ -1208,7 +1208,7 @@ You can change the settings of fish by changing the values of certain variables. - ``fish_history``, the current history session name. If set, all subsequent commands within an interactive fish session will be logged to a separate file identified by the value of the - variable. If unset, or set to ``default``, the default session name "fish" is used. If set to an + variable. If unset, the default session name "fish" is used. If set to an empty string, history is not saved to disk (but is still available within the interactive session). diff --git a/src/history.cpp b/src/history.cpp index 5c6e24bc5..4890c345e 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -1240,8 +1240,6 @@ wcstring history_session_id(const environment_t &vars) { wcstring session_id = var->as_string(); if (session_id.empty()) { result.clear(); - } else if (session_id == L"default") { - // using the default value } else if (valid_var_name(session_id)) { result = session_id; } else {