Buffer: Rename function names:

[lyx.git] / src / Lexer.cpp

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 931285375eb62cc4e188f3e89c2b927fd823f878..d824da0364542253cbc713202cb616f5831b4d2c 100644 (file)
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -250,7 +250,7 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
                                "file or stream already set.");
                gz_.open(filename.toFilesystemEncoding().c_str(), ios::in);
                is.rdbuf(&gz_);
-               name = filename.absFilename();
+               name = filename.absFileName();
                lineno = 0;
                if (!gz_.is_open() || !is.good())
                        return false;
@@ -266,7 +266,7 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
                }
                fb_.open(filename.toSafeFilesystemEncoding().c_str(), ios::in);
                is.rdbuf(&fb_);
-               name = filename.absFilename();
+               name = filename.absFileName();
                lineno = 0;
                if (!fb_.is_open() || !is.good())
                        return false;
@@ -473,7 +473,7 @@ bool Lexer::Pimpl::eatLine()
                is.get(cc);
                c = cc;
                //LYXERR(Debug::LYXLEX, "Lexer::EatLine read char: `" << c << '\'');
-               if (c != '\r')
+               if (c != '\r' && is)
                        buff.push_back(c);
        }