_("Search string is empty"));
return false;
}
- return bv->buffer();
+ return true;
}
docstring const & searchstr, docstring const & replacestr,
bool cs, bool mw)
{
- Buffer & buf = *bv->buffer();
+ Buffer & buf = bv->buffer();
if (!searchAllowed(bv, searchstr) || buf.isReadonly())
return 0;
int replace(BufferView * bv, docstring const & searchstr,
docstring const & replacestr, bool cs, bool mw, bool fw)
{
- if (!searchAllowed(bv, searchstr) || bv->buffer()->isReadonly())
+ if (!searchAllowed(bv, searchstr) || bv->buffer().isReadonly())
return 0;
if (!stringSelected(bv, searchstr, cs, mw, fw))
Cursor & cur = bv->cursor();
cap::replaceSelectionWithString(cur, replacestr, fw);
- bv->buffer()->markDirty();
+ bv->buffer().markDirty();
find(bv, searchstr, cs, mw, fw, false);
bv->update();
}
-void replace(BufferView * bv, FuncRequest const & ev)
+void replace(BufferView * bv, FuncRequest const & ev, bool has_deleted)
{
if (!bv || ev.action != LFUN_WORD_REPLACE)
return;
bool all = parse_bool(howto);
bool forward = parse_bool(howto);
- Buffer * buf = bv->buffer();
-
- int const replace_count = all
- ? replaceAll(bv, search, rplc, casesensitive, matchword)
- : replace(bv, search, rplc, casesensitive, matchword, forward);
-
- if (replace_count == 0) {
- // emit message signal.
- buf->message(_("String not found!"));
- } else {
- if (replace_count == 1) {
+ if (!has_deleted) {
+ int const replace_count = all
+ ? replaceAll(bv, search, rplc, casesensitive, matchword)
+ : replace(bv, search, rplc, casesensitive, matchword, forward);
+
+ Buffer & buf = bv->buffer();
+ if (replace_count == 0) {
// emit message signal.
- buf->message(_("String has been replaced."));
+ buf.message(_("String not found!"));
} else {
- docstring str = convert<docstring>(replace_count);
- str += _(" strings have been replaced.");
- // emit message signal.
- buf->message(str);
+ if (replace_count == 1) {
+ // emit message signal.
+ buf.message(_("String has been replaced."));
+ } else {
+ docstring str = convert<docstring>(replace_count);
+ str += _(" strings have been replaced.");
+ // emit message signal.
+ buf.message(str);
+ }
}
+ } else {
+ // if we have deleted characters, we do not replace at all, but
+ // rather search for the next occurence
+ bool const found = find(bv, search,
+ casesensitive, matchword, forward);
+
+ if (!found)
+ // emit message signal.
+ bv->message(_("String not found!"));
}
}
bool findNextChange(BufferView * bv)
{
- if (!bv->buffer())
- return false;
-
DocIterator cur = bv->cursor();
if (!findChange(cur))
Change orig_change = cur.paragraph().lookupChange(cur.pos());
- DocIterator et = doc_iterator_end(cur.inset());
- DocIterator ok = cur; // see below
- for (; cur != et; cur.forwardPosNoDescend()) {
- ok = cur;
- Change change = cur.paragraph().lookupChange(cur.pos());
- if (change != orig_change) {
+ CursorSlice & tip = cur.top();
+ for (; !tip.at_end(); tip.forwardPos()) {
+ Change change = tip.paragraph().lookupChange(tip.pos());
+ if (change != orig_change)
break;
- }
}
-
// avoid crash (assertion violation) if the imaginary end-of-par
// character of the last paragraph of the document is marked as changed
- if (cur == et) {
- cur = ok;
- }
+ if (tip.at_end())
+ tip.backwardPos();
// Now put cursor to end of selection:
bv->cursor().setCursor(cur);