diff options
Diffstat (limited to 'lisp/cedet/ede/cpp-root.el')
| -rw-r--r-- | lisp/cedet/ede/cpp-root.el | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index f715187f4b3..0a77692dd71 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2007-2019 Free Software Foundation, Inc. -;; Author: Eric M. Ludlam <eric@siege-engine.com> +;; Author: Eric M. Ludlam <zappo@gnu.org> ;; This file is part of GNU Emacs. @@ -150,12 +150,10 @@ ;; up the differences (the "include summary" reported the same include paths). (require 'ede) +(require 'semantic/db) (defvar semantic-lex-spp-project-macro-symbol-obarray) (declare-function semantic-lex-make-spp-table "semantic/lex-spp") -(declare-function semanticdb-file-table-object "semantic/db") -(declare-function semanticdb-needs-refresh-p "semantic/db") -(declare-function semanticdb-refresh-table "semantic/db") ;;; Code: @@ -281,7 +279,7 @@ Each directory needs a project file to control it.") "Make sure the :file is fully expanded." ;; Add ourselves to the master list (cl-call-next-method) - (let ((f (expand-file-name (oref this :file)))) + (let ((f (expand-file-name (oref this file)))) ;; Remove any previous entries from the main list. (let ((old (eieio-instance-tracker-find (file-name-directory f) :directory 'ede-cpp-root-project-list))) @@ -294,8 +292,8 @@ Each directory needs a project file to control it.") (file-directory-p f)) (delete-instance this) (error ":file for ede-cpp-root-project must be a file")) - (oset this :file f) - (oset this :directory (file-name-directory f)) + (oset this file f) + (oset this directory (file-name-directory f)) (ede-project-directory-remove-hash (file-name-directory f)) ;; NOTE: We must add to global list here because these classes are not ;; created via the typical loader, but instead via calls from a .emacs @@ -303,7 +301,7 @@ Each directory needs a project file to control it.") (ede-add-project-to-global-list this) (unless (slot-boundp this 'targets) - (oset this :targets nil)) + (oset this targets nil)) )) ;;; SUBPROJ Management. @@ -457,8 +455,8 @@ This is for project include paths and spp source files." "Compile the entire current project PROJ. Argument COMMAND is the command to use when compiling." ;; we need to be in the proj root dir for this to work - (let* ((cmd (oref proj :compile-command)) - (ov (oref proj :local-variables)) + (let* ((cmd (oref proj compile-command)) + (ov (oref proj local-variables)) (lcmd (when ov (cdr (assoc 'compile-command ov)))) (cmd-str (cond ((stringp cmd) cmd) @@ -472,8 +470,8 @@ Argument COMMAND is the command to use when compiling." (cl-defmethod project-compile-target ((obj ede-cpp-root-target) &optional command) "Compile the current target OBJ. Argument COMMAND is the command to use for compiling the target." - (when (oref obj :project) - (project-compile-project (oref obj :project) command))) + (when (oref obj project) + (project-compile-project (oref obj project) command))) (cl-defmethod project-rescan ((this ede-cpp-root-project)) |