anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-29 07:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow LyX to open empty files (created, e.g., via "touch").

Browse Source 
Patch from new contributor Jan Niklas Hasse.

(cherry picked from commit 0d77a7e325)
This commit is contained in:
Richard Heck 2017-01-19 15:34:45 -05:00
parent 6693fe5d6d
commit 239be02234
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/generate_contributions.py
View File

@ -827,6 +827,14 @@ contributors = [
"9 June 2015",
u"Haiku OS support"),
contributor(u"Jan Niklas Hasse",
"jhasse () bixense ! com",
"GPL",
"Re: Patch to make it possible to open empty files",
"m=148163124122780",
"23 December 2016",
u"File opening enhancement"),
contributor(u"Richard Heck",
"rgheck () comcast ! net",
"GPL",

18
src/buffer_funcs.cpp
View File

@ -95,12 +95,18 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
bool const exists = filename.exists();
bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
if (exists || tryVC) {
if (exists && !filename.isReadableFile()) {
docstring text = bformat(_("The file %1$s exists but is not "
"readable by the current user."),
from_utf8(filename.absFileName()));
Alert::error(_("File not readable!"), text);
return 0;
if (exists) {
if (!filename.isReadableFile()) {
docstring text = bformat(_("The file %1$s exists but is not "
"readable by the current user."),
from_utf8(filename.absFileName()));
Alert::error(_("File not readable!"), text);
return 0;
}
if (filename.extension() == "lyx" && filename.isFileEmpty()) {
// Makes it possible to open an empty (0 bytes) .lyx file
return newFile(filename.absFileName(), "", true);
}
}
Buffer * b = theBufferList().newBuffer(filename.absFileName());
if (!b) {