? Config
? dispatchresult-2.diff
? dispatchresult-3.diff
? dispatchresult.diff
? src/doit.sh
Index: src/dispatchresult.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/dispatchresult.h,v
retrieving revision 1.2
diff -u -p -r1.2 dispatchresult.h
--- src/dispatchresult.h 29 Oct 2003 13:24:55 -0000 1.2
+++ src/dispatchresult.h 29 Oct 2003 13:27:47 -0000
@@ -35,8 +35,7 @@ enum dispatch_result_t {
FINISHED,
FINISHED_RIGHT,
FINISHED_UP,
- FINISHED_DOWN,
- FINISHED_POP
+ FINISHED_DOWN
};
/** \c DispatchResult is a wrapper for dispatch_result_t.
Index: src/mathed/math_cursor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_cursor.C,v
retrieving revision 1.365
diff -u -p -r1.365 math_cursor.C
--- src/mathed/math_cursor.C 29 Oct 2003 13:24:57 -0000 1.365
+++ src/mathed/math_cursor.C 29 Oct 2003 13:27:47 -0000
@@ -1439,7 +1439,7 @@ DispatchResult MathCursor::dispatch(Func
CursorPos & pos = Cursor_[i];
DispatchResult res = pos.inset_->dispatch(cmd, pos.idx_, pos.pos_);
if (res != UNDISPATCHED) {
- if (res == FINISHED_POP) {
+ if (res == FINISHED) {
Cursor_.shrink(i + 1);
selClear();
}
Index: src/mathed/math_gridinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_gridinset.C,v
retrieving revision 1.128
diff -u -p -r1.128 math_gridinset.C
--- src/mathed/math_gridinset.C 29 Oct 2003 13:24:57 -0000 1.128
+++ src/mathed/math_gridinset.C 29 Oct 2003 13:27:48 -0000
@@ -1072,12 +1072,12 @@ DispatchResult MathGridInset::priv_dispa
idx = nargs() - 1;
if (pos > cell(idx).size())
pos = cell(idx).size();
- return FINISHED_POP;
+ return FINISHED;
case LFUN_CELL_SPLIT:
//recordUndo(bv, Undo::ATOMIC);
splitCell(idx, pos);
- return FINISHED_POP;
+ return FINISHED;
case LFUN_BREAKLINE: {
//recordUndo(bv, Undo::INSERT);
@@ -1096,7 +1096,7 @@ DispatchResult MathGridInset::priv_dispa
pos = cell(idx).size();
//mathcursor->normalize();
- return FINISHED_POP;
+ return FINISHED;
}
case LFUN_TABULAR_FEATURE: {
@@ -1152,8 +1152,8 @@ DispatchResult MathGridInset::priv_dispa
swapCol(col(idx));
else
return UNDISPATCHED;
- lyxerr << "returning DISPATCHED_POP" << endl;
- return FINISHED_POP;
+ lyxerr << "returning FINISHED" << endl;
+ return FINISHED;
}
case LFUN_PASTE: {
@@ -1184,7 +1184,7 @@ DispatchResult MathGridInset::priv_dispa
for (col_type c = 0; c < grid.ncols(); ++c)
cell(i).append(grid.cell(grid.index(r, c)));
}
- return FINISHED_POP;
+ return FINISHED;
}
default:
Index: src/mathed/math_hullinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hullinset.C,v
retrieving revision 1.99
diff -u -p -r1.99 math_hullinset.C
--- src/mathed/math_hullinset.C 29 Oct 2003 13:24:57 -0000 1.99
+++ src/mathed/math_hullinset.C 29 Oct 2003 13:27:48 -0000
@@ -782,7 +782,7 @@ DispatchResult MathHullInset::priv_dispa
mutate("eqnarray");
idx = 1;
pos = 0;
- return FINISHED_POP;
+ return FINISHED;
}
return MathGridInset::priv_dispatch(cmd, idx, pos);
@@ -837,7 +837,7 @@ DispatchResult MathHullInset::priv_dispa
case LFUN_MATH_EXTERN:
doExtern(cmd, idx, pos);
- return FINISHED_POP;
+ return FINISHED;
case LFUN_MATH_MUTATE: {
lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
@@ -849,14 +849,14 @@ DispatchResult MathHullInset::priv_dispa
idx = nargs() - 1;
if (pos > cell(idx).size())
pos = cell(idx).size();
- return FINISHED_POP;
+ return FINISHED;
}
case LFUN_MATH_DISPLAY: {
mutate(type_ == "simple" ? "equation" : "simple");
idx = 0;
pos = cell(idx).size();
- return FINISHED_POP;
+ return FINISHED;
}
default:
--
Lgb
