The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 3a3f6c838c2ea88dbe38294f19e35ef9f39d4d2f
Author: Enrico Forestieri <for...@lyx.org>
Date: Mon May 14 13:08:30 2012 +0200
Backport fix for bug #7982: LyX does not work if working directory a
hard disk drive like D:\.
In this case, the working dir has already a slash at the end.
Appending another one would result in a path ending with a double slash,
which has a special meaning when used in TEXINPUTS (all subdirs would
be recursively scanned). So, avoid doing that.
(cherry picked from commit 93ebb7a863377f6dbcaf724972b747b5c3f20c24)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 8dbf9b1..bba3610 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2624,7 +2624,11 @@ string Buffer::absFileName() const
string Buffer::filePath() const
{
- return d->filename.onlyPath().absFileName() + "/";
+ int last = d->filename.onlyPath().absFileName().length() - 1;
+
+ return d->filename.onlyPath().absFileName()[last] == '/'
+ ? d->filename.onlyPath().absFileName()
+ : d->filename.onlyPath().absFileName() + "/";
}
diff --git a/status.20x b/status.20x
index 1f52e2f..3bcbb8b 100644
--- a/status.20x
+++ b/status.20x
@@ -130,6 +130,9 @@ What's new
- Fixed an infinite loop when pasting '\\ ' into math (bug 8089).
+- Fixed problem when setting working directory on Windows to root of a
+ disk, e.g., C:\ (bug 7982).
+
- Don't reset the selected format each time we click into a new paragraph
in View->Source (bug 7997).
-----------------------------------------------------------------------
Summary of changes:
src/Buffer.cpp | 6 +++++-
status.20x | 3 +++
2 files changed, 8 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
