Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* 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'.
This commit is contained in:
Stefan Monnier 2015-05-06 09:56:03 -04:00
parent 7ddf29d8f5
commit 2fa7c314a5
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/cedet/ede.el
View file

@ -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

2
lisp/cedet/ede/generic.el
View file

@ -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)))))

3
lisp/cedet/semantic/bovine/gcc.el
View file

@ -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))