commit 71ff50b7536124eafda877514b608182767538bc
Author: Enrico Forestieri <for...@lyx.org>
Date: Sun Jan 10 23:17:59 2016 +0100
Make sure the origin tag is properly terminated.
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index fe47c05..8024d4a 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1015,11 +1015,11 @@ void BufferParams::writeFile(ostream & os, Buffer const
* buf) const
// The top of the file is written by the buffer.
// Prints out the buffer info into the .lyx file given by file
- // the document directory
- // use realPath() instead of absFileName() for comparing
- // so we can catch also eventually used symbolic parts of the path.
- string filepath = buf->fileName().onlyPath().realPath();
- string const sysdir = package().system_support().realPath();
+ // the document directory (must end with a path separator)
+ // realPath() is used to resolve symlinks, while addPath(..., "")
+ // ensures a trailing path separator.
+ string filepath = addPath(buf->fileName().onlyPath().realPath(), "");
+ string const sysdir = addPath(package().system_support().realPath(),
"");
string const relpath =
to_utf8(makeRelPath(from_utf8(filepath), from_utf8(sysdir)));
if (!prefixIs(relpath, "../") && !FileName::isAbsolute(relpath))
