Merge branch '2.4.3' into lexer2

2015-03-20 17:16:48 -04:00
parent 289780c8cc f5af3368a9
commit 24a1cbefe9
49 changed files with 876 additions and 850 deletions
--- a/src/CLI.h
+++ b/src/CLI.h
@@ -81,7 +81,7 @@ public:
  void addRawFilter (const std::string& arg);
  void analyze (bool parse = true, bool strict = false);
  void applyOverrides ();
-  const std::string getFilter ();
+  const std::string getFilter (bool applyContext = true);
  const std::vector <std::string> getWords ();
  bool canonicalize (std::string&, const std::string&, const std::string&) const;
  std::string getBinary () const;