Merge branch 'master' into cairo

[gnu-emacs] / lisp / cedet / ede.el

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 074fda978621f65f032db085dfdb21d8db6f9d88..43660a8bb716ce52fbafef660c4b0b77b4e662bf 100644 (file)
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -339,7 +339,7 @@ Argument MENU-DEF is the menu definition to use."
          (progn
            (while (and class (slot-exists-p class 'menu))
              ;;(message "Looking at class %S" class)
-             (setq menu (append menu (oref class menu))
+             (setq menu (append menu (oref-default class menu))
                    class (eieio-class-parent class))
              (if (listp class) (setq class (car class))))
            (append