From 153e8437745ada833681a799ab535dfd455b4a6f Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 6 Apr 2013 17:27:29 +0200 Subject: [PATCH] settings: disable regexes by default --- doc/config | 2 +- src/settings.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/config b/doc/config index 79b2a5f1..390880ae 100644 --- a/doc/config +++ b/doc/config @@ -416,7 +416,7 @@ # #display_remaining_time = "no" # -#regular_expressions = "basic" (basic/extended) +#regular_expressions = "none" (none/basic/extended) # ## ## Note: If below is enabled, ncmpcpp will ignore leading diff --git a/src/settings.cpp b/src/settings.cpp index b0a31bb9..be4af82c 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -228,7 +228,7 @@ void Configuration::SetDefaults() playlist_disable_highlight_delay = 5; message_delay_time = 4; lyrics_db = 0; - regex_type = boost::regex::icase; + regex_type = boost::regex::literal | boost::regex::icase; lines_scrolled = 2; search_engine_default_search_mode = 0; visualizer_sync_interval = 30; @@ -783,11 +783,11 @@ void Configuration::Read() else if (name == "regular_expressions") { if (v == "none") - regex_type |= boost::regex::literal; + regex_type = boost::regex::literal | boost::regex::icase; else if (v == "basic") - regex_type |= boost::regex::basic; + regex_type = boost::regex::basic | boost::regex::icase; else if (v == "extended") - regex_type |= boost::regex::extended; + regex_type = boost::regex::extended | boost::regex::icase; } else if (name == "lines_scrolled") {