mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-14 15:05:56 +00:00
Do not auto-insert separator for keepempty layouts
Candidate for stable
(cherry picked from commit 59d73f52b8
)
This commit is contained in:
parent
783f94afc2
commit
a9890828bd
@ -1207,6 +1207,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
|
|||||||
pit_type prev = pit > 0 ? depthHook(pit, par.getDepth()) : pit;
|
pit_type prev = pit > 0 ? depthHook(pit, par.getDepth()) : pit;
|
||||||
if (prev < pit && cur.pos() == par.beginOfBody()
|
if (prev < pit && cur.pos() == par.beginOfBody()
|
||||||
&& !par.size() && !par.isEnvSeparator(cur.pos())
|
&& !par.size() && !par.isEnvSeparator(cur.pos())
|
||||||
|
&& !par.layout().keepempty
|
||||||
&& !par.layout().isCommand()
|
&& !par.layout().isCommand()
|
||||||
&& pars_[prev].layout() != par.layout()
|
&& pars_[prev].layout() != par.layout()
|
||||||
&& pars_[prev].layout().isEnvironment()
|
&& pars_[prev].layout().isEnvironment()
|
||||||
|
@ -69,6 +69,8 @@ What's new
|
|||||||
|
|
||||||
- Fix parsing of math-macro optional arguments after save-reopen (bug 11346).
|
- Fix parsing of math-macro optional arguments after save-reopen (bug 11346).
|
||||||
|
|
||||||
|
- Fix problem with wrongly inserted separator.
|
||||||
|
|
||||||
|
|
||||||
* USER INTERFACE
|
* USER INTERFACE
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user