From ca90893216a060a1910c1ec16edd0ea1956a041f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 13 Jun 2015 13:38:19 -0400
Subject: [PATCH] CLI2: Static initialization of global settings.

---
 src/CLI2.cpp    | 2 +-
 src/CLI2.h      | 3 +--
 src/Context.cpp | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 81b3bc6c9..1fc49bbb6 100644
--- a/src/CLI2.cpp
+++ b/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;
 
diff --git a/src/CLI2.h b/src/CLI2.h
index 58e8c4313..e57468174 100644
--- a/src/CLI2.h
+++ b/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**);
diff --git a/src/Context.cpp b/src/Context.cpp
index 1d97e8326..47a13da0d 100644
--- a/src/Context.cpp
+++ b/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");