Small fix.

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 4068b7eb2ade0a1e97ec65a05e87203b404ececa..7da1fbef105ff296f19cabad3af133cabe7bef0f 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -19,12 +19,7 @@ using std::lower_bound;
 
 // namespace {
 struct compare_tags {
-       // used by lower_bound
-       inline
-       int operator()(keyword_item const & a, char const * const tag) const {
-               return compare_no_case(a.tag, tag) < 0;
-       }
-       // used by sorted and sort
+       // used by lower_bound, sort and sorted
        inline
        int operator()(keyword_item const & a, keyword_item const & b) const {
                return compare_no_case(a.tag, b.tag) < 0;
@@ -119,11 +114,11 @@ void LyXLex::Pimpl::popTable()
 
 bool LyXLex::Pimpl::setFile(string const & filename)
 {
-       //if (fb__.is_open())
-       //      lyxerr << "Error in LyXLex::setFile: "
-       //              "file or stream already set." << endl;
+       if (fb__.is_open())
+               lyxerr << "Error in LyXLex::setFile: "
+                       "file or stream already set." << endl;
        fb__.open(filename.c_str(), ios::in);
-       //is.rdbuf(&fb__);
+       is.rdbuf(&fb__);
        name = filename;
        lineno = 0;
        return fb__.is_open() && is.good();
@@ -345,12 +340,13 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
        }
 }
 
-       ///
+
 int LyXLex::Pimpl::search_kw(char const * const tag) const
 {
+       keyword_item search_tag = { tag, 0 };
        keyword_item * res =
                lower_bound(table, table + no_items,
-                           tag, compare_tags());
+                           search_tag, compare_tags());
        if (res != table + no_items
            && !compare_no_case(res->tag, tag))
                return res->code;