From: Pavel Sanda <sanda@lyx.org>
Date: Sat, 29 Dec 2018 16:55:55 +0000 (+0100)
Subject: Backport 33284ee5c.
X-Git-Tag: 2.3.3~86
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=78e256163ab4fef7766d023bf8388ac062a49984;p=features.git

Backport 33284ee5c.
---

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index f2e4eda81f..767bb6bac7 100644
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -216,6 +216,11 @@ bool GuiCompleter::eventFilter(QObject * watched, QEvent * e)
 			tab();
 			ke->accept();
 			return true;
+		case Qt::Key_Escape:
+			hidePopup();
+			hideInline();
+			updateVisibility(false, false);
+			return true;
 		default: break;
 		}
 	}
diff --git a/status.23x b/status.23x
index e83d551a18..5e577dde9b 100644
--- a/status.23x
+++ b/status.23x
@@ -97,6 +97,8 @@ What's new
 
 - Fix size of layout combo (bug 6096).
 
+- Completion popup context menu now properly responds to Esc key.
+
 
 * INTERNALS