From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 6 May 2015 13:56:03 +0000 (-0400)
Subject: CEDET: Avoid `oref' on classes in a few more cases
X-Git-Tag: emacs-25.0.90~2181
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2fa7c314a52c8d1cb29a893341d1c03e8ede57cd;p=emacs.git

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 074fda97862..43660a8bb71 100644
--- 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 7e1425f1318..9e6fc978376 100644
--- 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 b186e7bd6ee..fe7a14451f5 100644
--- 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))