diff options
| -rw-r--r-- | src/parser.cpp | 37 | ||||
| -rw-r--r-- | src/ring.h | 7 | ||||
| -rw-r--r-- | src/search.cpp | 19 |
3 files changed, 44 insertions, 19 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index e99f406..1510352 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -581,7 +581,8 @@ StateStart::insert_integer(tecoInt v) interface.ssm(SCI_ENDUNDOACTION); ring.dirtify(); - undo.push_msg(SCI_UNDO); + if (current_doc_must_undo()) + undo.push_msg(SCI_UNDO); } tecoInt @@ -622,7 +623,9 @@ StateStart::move_chars(tecoInt n) return FAILURE; interface.ssm(SCI_GOTOPOS, pos + n); - undo.push_msg(SCI_GOTOPOS, pos); + if (current_doc_must_undo()) + undo.push_msg(SCI_GOTOPOS, pos); + return SUCCESS; } @@ -636,7 +639,9 @@ StateStart::move_lines(tecoInt n) return FAILURE; interface.ssm(SCI_GOTOLINE, line); - undo.push_msg(SCI_GOTOPOS, pos); + if (current_doc_must_undo()) + undo.push_msg(SCI_GOTOPOS, pos); + return SUCCESS; } @@ -685,7 +690,8 @@ StateStart::delete_words(tecoInt n) } undo.push_msg(SCI_GOTOPOS, pos); - undo.push_msg(SCI_UNDO); + if (current_doc_must_undo()) + undo.push_msg(SCI_UNDO); ring.dirtify(); return SUCCESS; @@ -1059,9 +1065,10 @@ StateStart::custom(gchar chr) interface.ssm(SCI_BEGINUNDOACTION); interface.ssm(SCI_CLEARALL); interface.ssm(SCI_ADDTEXT, cmdline_pos-1, (sptr_t)cmdline); - /* FIXME: scroll into view */ + interface.ssm(SCI_SCROLLCARET); interface.ssm(SCI_ENDUNDOACTION); + /* must always support undo on global register */ undo.push_msg(SCI_UNDO); break; @@ -1116,8 +1123,9 @@ StateStart::custom(gchar chr) BEGIN_EXEC(this); v = expressions.pop_num_calc(1, 0); if (Validate::pos(v)) { - undo.push_msg(SCI_GOTOPOS, - interface.ssm(SCI_GETCURRENTPOS)); + if (current_doc_must_undo()) + undo.push_msg(SCI_GOTOPOS, + interface.ssm(SCI_GETCURRENTPOS)); interface.ssm(SCI_GOTOPOS, v); if (eval_colon()) @@ -1254,7 +1262,8 @@ StateStart::custom(gchar chr) break; } if (v < 0) { - undo.push_msg(SCI_GOTOPOS, pos); + if (current_doc_must_undo()) + undo.push_msg(SCI_GOTOPOS, pos); if (eval_colon()) expressions.push(SUCCESS); } else { @@ -1417,8 +1426,10 @@ StateStart::custom(gchar chr) if (len == 0 || IS_FAILURE(rc)) break; - undo.push_msg(SCI_GOTOPOS, interface.ssm(SCI_GETCURRENTPOS)); - undo.push_msg(SCI_UNDO); + if (current_doc_must_undo()) { + undo.push_msg(SCI_GOTOPOS, interface.ssm(SCI_GETCURRENTPOS)); + undo.push_msg(SCI_UNDO); + } interface.ssm(SCI_BEGINUNDOACTION); interface.ssm(SCI_DELETERANGE, from, len); @@ -2110,7 +2121,8 @@ StateInsert::initial(void) interface.ssm(SCI_ENDUNDOACTION); ring.dirtify(); - undo.push_msg(SCI_UNDO); + if (current_doc_must_undo()) + undo.push_msg(SCI_UNDO); } void @@ -2123,7 +2135,8 @@ StateInsert::process(const gchar *str, gint new_chars) interface.ssm(SCI_ENDUNDOACTION); ring.dirtify(); - undo.push_msg(SCI_UNDO); + if (current_doc_must_undo()) + undo.push_msg(SCI_UNDO); } State * @@ -247,4 +247,11 @@ current_doc_update(void) QRegisters::current->update_string(); } +static inline bool +current_doc_must_undo(void) +{ + return ring.current || + QRegisters::current->must_undo; +} + #endif diff --git a/src/search.cpp b/src/search.cpp index 5232785..7f8b04e 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -417,9 +417,10 @@ StateSearch::process(const gchar *str, gint new_chars) gint count = parameters.count; - undo.push_msg(SCI_SETSEL, - interface.ssm(SCI_GETANCHOR), - interface.ssm(SCI_GETCURRENTPOS)); + if (current_doc_must_undo()) + undo.push_msg(SCI_SETSEL, + interface.ssm(SCI_GETANCHOR), + interface.ssm(SCI_GETCURRENTPOS)); search_reg->undo_set_integer(); search_reg->set_integer(FAILURE); @@ -505,7 +506,8 @@ StateSearch::done(const gchar *str) if (*str) { /* workaround: preserve selection (also on rubout) */ gint anchor = interface.ssm(SCI_GETANCHOR); - undo.push_msg(SCI_SETANCHOR, anchor); + if (current_doc_must_undo()) + undo.push_msg(SCI_SETANCHOR, anchor); search_reg->undo_set_string(); search_reg->set_string(str); @@ -655,7 +657,8 @@ StateSearchKill::done(const gchar *str) /* kill forwards */ gint anchor = interface.ssm(SCI_GETANCHOR); - undo.push_msg(SCI_GOTOPOS, dot); + if (current_doc_must_undo()) + undo.push_msg(SCI_GOTOPOS, dot); interface.ssm(SCI_GOTOPOS, anchor); interface.ssm(SCI_DELETERANGE, @@ -667,7 +670,8 @@ StateSearchKill::done(const gchar *str) interface.ssm(SCI_ENDUNDOACTION); ring.dirtify(); - undo.push_msg(SCI_UNDO); + if (current_doc_must_undo()) + undo.push_msg(SCI_UNDO); return &States::start; } @@ -700,7 +704,8 @@ StateSearchDelete::done(const gchar *str) interface.ssm(SCI_ENDUNDOACTION); ring.dirtify(); - undo.push_msg(SCI_UNDO); + if (current_doc_must_undo()) + undo.push_msg(SCI_UNDO); } return &States::start; |