From 6806ad98dfff0aaf8c7eb57136d5f6922daafd0e Mon Sep 17 00:00:00 2001
From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Thu, 4 Oct 2018 20:37:03 -0400
Subject: [PATCH] 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)
---
 src/frontends/qt4/GuiView.cpp | 10 ++++++++--
 status.23x                    |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 1d0308ad6c..f2d3157a32 100644
--- 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 8af1b1bea6..37a69efc7d 100644
--- 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