Backport 33284ee5c.

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index f2e4eda81f10509af19f8e656d2ada45235a8353..767bb6bac747da2ac5f6616255915ab109cca6cb 100644 (file)
--- 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 e83d551a188de46d528ab09072061b982acfdf93..5e577dde9b1592b3d9087bfc4e6c11f01721cb4d 100644 (file)
--- 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