(edebug-emacs-19-specific): Call

display-popup-menus-p instead of looking at window-system.

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index fe5bd5d474e9739ffbedb50cd131b5b283beb97e..9533da37f66a5852faf8133d7a6f51d9c4fa85dc 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4396,7 +4396,7 @@ Print result in minibuffer."
       (edebug-safe-prin1-to-string (car values)))))
 
   (easy-menu-define edebug-menu edebug-mode-map "Edebug menus" edebug-mode-menus)
-  (if window-system
+  (if (display-popup-menus-p)
       (x-popup-menu nil (lookup-key edebug-mode-map [menu-bar Edebug])))
   )