CLI2: Static initialization of global settings.

src/CLI2.cpp

@@ -38,10 +38,10 @@
 
 extern Context context;
 
-/*
 // Overridden by rc.abbreviation.minimum.
 int CLI2::minimumMatchLength = 3;
 
+/*
 // Alias expansion limit. Any more indicates some kind of error.
 static int safetyValveDefault = 10;
 

src/CLI2.h

@@ -68,9 +68,8 @@ public:
 class CLI2
 {
 public:
-/*
   static int minimumMatchLength;
-*/
+
   static void getOverride (int, const char**, std::string&, File&);
   static void getDataLocation (int, const char**, Path&);
   static void applyOverrides (int, const char**);

src/Context.cpp

@@ -624,6 +624,7 @@ void Context::getLimits (int& rows, int& lines)
 void Context::staticInitialization ()
 {
   CLI::minimumMatchLength   = config.getInteger ("abbreviation.minimum");
+  CLI2::minimumMatchLength   = config.getInteger ("abbreviation.minimum");
 
   Task::defaultProject      = config.get ("default.project");
   Task::defaultDue          = config.get ("default.due");