anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug that files with nonascii filenames are always reported

Browse Source 
as externally modified.

	* src/Buffer.cpp (Buffer::readFile): filenames are always stored
	as UTF-8 in the FileName class.

	* src/support/FileName.h: correct comment.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21620 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2007-11-14 23:30:13 +00:00
parent a3393e63b8
commit 067e21046f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Buffer.cpp
View File

@ -762,7 +762,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
// Save the timestamp and checksum of disk file. If filename is an // Save the timestamp and checksum of disk file. If filename is an
// emergency file, save the timestamp and sum of the original lyx file // emergency file, save the timestamp and sum of the original lyx file
// because isExternallyModified will check for this file. (BUG4193) // because isExternallyModified will check for this file. (BUG4193)
string diskfile = filename.toFilesystemEncoding(); string diskfile = filename.absFilename();
if (suffixIs(diskfile, ".emergency")) if (suffixIs(diskfile, ".emergency"))
diskfile = diskfile.substr(0, diskfile.size() - 10); diskfile = diskfile.substr(0, diskfile.size() - 10);
saveCheckSum(FileName(diskfile)); saveCheckSum(FileName(diskfile));

4
src/support/FileName.h
View File

@ -113,9 +113,7 @@ public:
protected: protected:
/// The absolute file name. /// The absolute file name in UTF-8 encoding.
/// The encoding is currently unspecified, anything else than ASCII
/// may or may not work.
std::string name_; std::string name_;
}; };