Make sure that inset-forall does not skip insets

This could happen with
  inset-forall Note:Note char-delete-forward
when there where consecutive note insets.

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 057fe0bb32199be516d99812ab2b9cbb3794a60b..d490fe756a4ec3686b73b8c05460a749f05da236 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1778,7 +1778,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        cur.forwardInset();
                cur.beginUndoGroup();
                while(cur && iterations < max_iter) {
-                       Inset * ins = cur.nextInset();
+                       Inset * const ins = cur.nextInset();
                        if (!ins)
                                break;
                        docstring insname = ins->layoutName();
@@ -1794,7 +1794,9 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                                        break;
                                insname = insname.substr(0, i);
                        }
-                       cur.forwardInset();
+                       // if we did not delete the inset, skip it
+                       if (!cur.nextInset() || cur.nextInset() == ins)
+                               cur.forwardInset();
                }
                cur.endUndoGroup();
                cur = savecur;

diff --git a/status.20x b/status.20x
index abf1cc737f18a79bc88294291ce2bf5938306089..3cafc49cea17835a7a01fabb93fe1e3c2f6fb3aa 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -124,6 +124,8 @@ What's new
 
 - Do not crop wide characters in Symbols dialog (bug 5707).
 
+- Make sure that inset-forall does not skip insets.
+
 
 * DOCUMENTATION AND LOCALIZATION