CEDET (development tools) package merged.

[bpt/emacs.git] / lisp / cedet / ede.el

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 65da831..54c0c93 100644 (file)
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -605,7 +605,7 @@ Argument LIST-O-O is the list of objects to choose from."
 (defun ede-menu-obj-of-class-p (class)
   "Return non-nil if some member of `ede-object' is a child of CLASS."
   (if (listp ede-object)
-      (ede-or (mapcar (lambda (o) (obj-of-class-p o class)) ede-object))
+      (eval (cons 'or (mapcar (lambda (o) (obj-of-class-p o class)) ede-object)))
     (obj-of-class-p ede-object class)))
 
 (defun ede-build-forms-menu (menu-def)
@@ -1838,7 +1838,7 @@ See also `ede-map-subprojects'."
 (defmethod ede-map-any-target-p ((this ede-project) proc)
   "For project THIS, map PROC to all targets and return if any non-nil.
 Return the first non-nil value returned by PROC."
-  (ede-or (ede-map-targets this proc)))
+  (eval (cons 'or (ede-map-targets this proc))))
 
 \f
 ;;; Some language specific methods.
@@ -1931,15 +1931,6 @@ If VARIABLE is not project local, just use set."
     rs))
 
 \f
-;;; Lame stuff
-;;
-(defun ede-or (arg)
-  "Do `or' like stuff to ARG because you can't apply `or'."
-  (while (and arg (not (car arg)))
-    (setq arg (cdr arg)))
-  arg)
-
-\f
 ;;; Debugging.
 
 (defun ede-adebug-project ()