diff --git a/share/tools/web_config/js/controllers.js b/share/tools/web_config/js/controllers.js index a2d35d58e..01eed9d03 100644 --- a/share/tools/web_config/js/controllers.js +++ b/share/tools/web_config/js/controllers.js @@ -119,7 +119,11 @@ controllers.controller("colorsController", function($scope, $http) { "autosuggestion", "user", "host", - "cancel" + "cancel", + "fish_pager_color_completion", + "fish_pager_color_description", + "fish_pager_color_prefix", + "fish_pager_color_progress" ]; var remaining = settingNames.length; for (name of settingNames) { diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py index 39a830de1..b977f6fcb 100755 --- a/share/tools/web_config/webconfig.py +++ b/share/tools/web_config/webconfig.py @@ -735,10 +735,16 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): def do_set_color_for_variable(self, name, color, background_color, bold, underline): + "Sets a color for a fish color name, like 'autosuggestion'" if not color: color = 'normal' - "Sets a color for a fish color name, like 'autosuggestion'" - command = 'set -U fish_color_' + name + varname = 'fish_color' + name + # If the name already starts with "fish_", use it as the varname + # This is needed for 'fish_pager_color' vars. + if name.startswith('fish_'): + varname = name + # TODO: Check if the varname is allowable. + command = 'set -U ' + varname if color: command += ' ' + color if background_color: