Fix bug #9004.

I'm not entirely happy with this way of doing it. It seems messy.
But there is not another clear option right now.

(cherry picked from commit 4f0ccae3990bfe1c6ce268bfb3c22f7bfe9cfc0b)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 1d0308ad6cdd43ee439415cdc71fbb7b22159c75..f2d3157a325d0433397c5872be0e7cbf8c2edc94 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3666,15 +3666,21 @@ void GuiView::dispatchToBufferView(FuncRequest const & cmd, DispatchResult & dr)
 
        // Let the current BufferView dispatch its own actions.
        bv->dispatch(cmd, dr);
-       if (dr.dispatched())
+       if (dr.dispatched()) {
+               if (cmd.action() == LFUN_REDO || cmd.action() == LFUN_UNDO)
+                       updateDialog("document", "");
                return;
+       }
 
        // Try with the document BufferView dispatch if any.
        BufferView * doc_bv = documentBufferView();
        if (doc_bv && doc_bv != bv) {
                doc_bv->dispatch(cmd, dr);
-               if (dr.dispatched())
+               if (dr.dispatched()) {
+                       if (cmd.action() == LFUN_REDO || cmd.action() == LFUN_UNDO)
+                               updateDialog("document", "");
                        return;
+               }
        }
 
        // Then let the current Cursor dispatch its own actions.

diff --git a/status.23x b/status.23x
index 8af1b1bea60cc3ca7a1d9e5ab024dba2dd7bb120..37a69efc7d1e07d2660b343926bd3d9ac18fcd3f 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -93,6 +93,8 @@ What's new
 - Fix missing TOC update (and related bugs) when setting default master (bug 
   11422).
 
+- Fix problem with undo of document settings (bug 9004).
+
 
 * INTERNALS