Michael Gerz wrote:
All,
it seems that the unicode migration will not be completed soon. This
makes me wonder whether I am allowed to merge my CT branch with the
trunk. I am fully aware that my work in not completely finished (I guess
that about 95% of the code is ready). On the other hand, I added FIXME
whereever I was uncertain about the current solution. Maintaining the CT
branch forever will inevitably result in broken code, in particular if
others shift code from one file to another.
Yes it would be nice if you merge your branch because ChangeTracking is
responsible for 2 of the last 3 lines of code that still needs the
LyXView owner_:
1) in BufferView::switchKeyMap()
Intl & intl = owner_->getIntl();
2) in BufferView::dispatch()
case LFUN_CHANGES_MERGE:
if (lyx::find::findNextChange(this))
owner_->getDialogs().show("changes");
break;
3)in BufferView::trackChanges()
if (lyx::find::findNextChange(this)) {
owner_->getDialogs().show("changes");
Abdel.
