anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Work around bug #9841"

Browse Source 
This reverts commit dc016de34e.

See discussion at http://mid.gmane.org/n53ar8$1tj$1@ger.gmane.org
This commit is contained in:
Guillaume Munch 2015-12-20 13:08:49 +00:00
parent b529a2ffe5
commit f475795b92
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BufferParams.cpp
View File

@ -1274,14 +1274,9 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
}
os << "\\tracking_changes " << convert<string>(track_changes) << '\n'
<< "\\output_changes " << convert<string>(output_changes) << '\n'
<< "\\html_math_output " << html_math_output << '\n'
<< "\\html_css_as_file " << html_css_as_file << '\n'
// \output_changes is output at a distance from \tracking changes as a
// workaround to bug #9841: both parameters can be seen as per-user
// preferences and therefore can cause undesirable merge conflicts, in a
// multi-author setting, if it were treated as a single block by the
// version control system.
<< "\\output_changes " << convert<string>(output_changes) << '\n'
<< "\\html_be_strict " << convert<string>(html_be_strict) << '\n';
if (html_math_img_scale != 1.0)