CEDET: Avoid `oref' on classes in a few more cases

* lisp/cedet/ede/generic.el (ede-find-target):
* lisp/cedet/ede.el (ede-project-forms-menu): Avoid `oref' on classes.
* lisp/cedet/semantic/bovine/gcc.el (semantic-gcc-setup): Remove unused
var `prefix'.

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

diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 7e1425f131841b084c44513ae4736f35c6a508aa..9e6fc9783762514eb7cad83e77bf40ead22e94e7 100644 (file)
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -230,7 +230,7 @@ If one doesn't exist, create a new one for this directory."
     (when ext
       (dolist (C classes)
        (let* ((classsym (intern (car C)))
-              (extreg (oref classsym extension)))
+              (extreg (oref-default classsym extension)))
          (when (and (not (string= extreg ""))
                     (string-match (concat "\\`\\(?:" extreg "\\)\\'") ext))
            (setq cls classsym)))))

diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el
index b186e7bd6ee737c331005acd5797ed729f68ff93..fe7a14451f51603a878678003f0044d7e17aa595 100644 (file)
--- a/lisp/cedet/semantic/bovine/gcc.el
+++ b/lisp/cedet/semantic/bovine/gcc.el
@@ -164,8 +164,9 @@ It should also include other symbols GCC was compiled with.")
          (host (or (cdr (assoc 'target fields))
                    (cdr (assoc '--target fields))
                    (cdr (assoc '--host fields))))
-         (prefix (cdr (assoc '--prefix fields)))
+         ;; (prefix (cdr (assoc '--prefix fields)))
          ;; gcc output supplied paths
+         ;; FIXME: Where are `c-include-path' and `c++-include-path' used?
          (c-include-path (semantic-gcc-get-include-paths "c"))
          (c++-include-path (semantic-gcc-get-include-paths "c++"))
         (gcc-exe (locate-file "gcc" exec-path exec-suffixes 'executable))