From ec5876d56b54a12db9481da9cb46f51c54f394f1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 13 Jun 2015 14:02:18 -0400
Subject: [PATCH] CLI2: Aliases captured.

- CLI2::alias now captures all alias definitions from Context::Config.
---
 src/CLI2.cpp    | 2 --
 src/CLI2.h      | 4 +---
 src/Context.cpp | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index fedff7923..f0db397d1 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -311,13 +311,11 @@ CLI2::~CLI2 ()
 {
 }
 
-/*
 ////////////////////////////////////////////////////////////////////////////////
 void CLI2::alias (const std::string& name, const std::string& value)
 {
   _aliases.insert (std::pair <std::string, std::string> (name, value));
 }
-*/
 
 ////////////////////////////////////////////////////////////////////////////////
 void CLI2::entity (const std::string& category, const std::string& name)
diff --git a/src/CLI2.h b/src/CLI2.h
index 3c4fb0fc7..025a5720e 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -77,9 +77,7 @@ public:
 public:
   CLI2 ();
   ~CLI2 ();
-/*
   void alias (const std::string&, const std::string&);
-*/
   void entity (const std::string&, const std::string&);
 /*
   void initialize (int, const char**);
@@ -144,8 +142,8 @@ private:
 
 public:
   std::multimap <std::string, std::string> _entities;
-/*
   std::map <std::string, std::string>      _aliases;
+/*
   std::vector <std::string>                _original_args;
   std::vector <A>                          _args;
 
diff --git a/src/Context.cpp b/src/Context.cpp
index 5a3eb24b1..73ca5a92c 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -802,6 +802,10 @@ void Context::updateVerbosity ()
 ////////////////////////////////////////////////////////////////////////////////
 void Context::loadAliases ()
 {
+  for (auto& i : config)
+    if (i.first.substr (0, 6) == "alias.")
+      cli2.alias (i.first.substr (6), i.second);
+
   for (auto& i : config)
     if (i.first.substr (0, 6) == "alias.")
       cli.alias (i.first.substr (6), i.second);