branch: elpa/popup
commit 6862a4732a3f3eee25aba5bf2548228cd9cadcaf
Author: Tomohiro Matsuyama <t...@cx4a.org>
Commit: Tomohiro Matsuyama <t...@cx4a.org>

    Fixed cascade menu corruption.
---
 popup.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/popup.el b/popup.el
index fbf1bee..1a0db18 100644
--- a/popup.el
+++ b/popup.el
@@ -1136,13 +1136,14 @@ PROMPT is a prompt string when reading events during 
event loop."
                (sublist (popup-item-sublist item)))
           (unless index (return))
           (if sublist
-              (popup-aif (popup-cascade-menu sublist
-                                             :around nil
-                                             :margin-left (popup-margin-left 
menu)
-                                             :margin-right (popup-margin-right 
menu)
-                                             :scroll-bar (popup-scroll-bar 
menu)
-                                             :parent menu
-                                             :parent-offset index)
+              (popup-aif (let (popup-use-optimized-column-computation)
+                           (popup-cascade-menu sublist
+                                               :around nil
+                                               :margin-left (popup-margin-left 
menu)
+                                               :margin-right 
(popup-margin-right menu)
+                                               :scroll-bar (popup-scroll-bar 
menu)
+                                               :parent menu
+                                               :parent-offset index))
                   (and it (return it)))
             (if (eq binding 'popup-select)
                 (return (popup-item-value-or-self item))))))

Reply via email to