diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-04 13:49:49 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-04 13:49:49 -0500 |
commit | 73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121 (patch) | |
tree | fc2ee663521960bf1c102bb98a72f31903e5110b /lisp/cedet/ede/auto.el | |
parent | 102a21d68976ab9dc85304e0bc47b7562d3cf93f (diff) | |
download | emacs-73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121.tar.gz |
* lisp/cedet: Use cl-generic instead of EIEIO's defgeneric/defmethod
* lisp/cedet/**/*.el: Mechanically replace all calls to defmethod/defgeneric
by calls to cl-defmethod/cl-defgeneric.
* lisp/cedet/srecode/table.el:
* lisp/cedet/srecode/fields.el:
* lisp/cedet/srecode/dictionary.el:
* lisp/cedet/srecode/compile.el:
* lisp/cedet/semantic/debug.el:
* lisp/cedet/semantic/db-ref.el:
* lisp/cedet/ede/base.el:
* lisp/cedet/ede/auto.el:
* lisp/cedet/ede.el: Require `cl-generic'.
Diffstat (limited to 'lisp/cedet/ede/auto.el')
-rw-r--r-- | lisp/cedet/ede/auto.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el index 769bea4ce50..7e8df6b89af 100644 --- a/lisp/cedet/ede/auto.el +++ b/lisp/cedet/ede/auto.el @@ -30,6 +30,7 @@ ;;; Code: (require 'eieio) +(require 'cl-generic) (declare-function ede-directory-safe-p "ede") (declare-function ede-add-project-to-global-list "ede") @@ -62,7 +63,7 @@ location is varied dependent on other complex criteria, this class can be used to define that match without loading the specific project into memory.") -(defmethod ede-dirmatch-installed ((dirmatch ede-project-autoload-dirmatch)) +(cl-defmethod ede-dirmatch-installed ((dirmatch ede-project-autoload-dirmatch)) "Return non-nil if the tool DIRMATCH might match is installed on the system." (let ((fc (oref dirmatch fromconfig))) @@ -77,7 +78,7 @@ into memory.") (t (error "Unknown dirmatch type."))))) -(defmethod ede-do-dirmatch ((dirmatch ede-project-autoload-dirmatch) file) +(cl-defmethod ede-do-dirmatch ((dirmatch ede-project-autoload-dirmatch) file) "Does DIRMATCH match the filename FILE." (let ((fc (oref dirmatch fromconfig))) @@ -271,7 +272,7 @@ added. Possible values are: ;; ;; New method using detect.el -(defmethod ede-auto-detect-in-dir ((this ede-project-autoload) dir) +(cl-defmethod ede-auto-detect-in-dir ((this ede-project-autoload) dir) "Return non-nil if THIS project autoload is found in DIR." (let* ((d (file-name-as-directory dir)) (pf (oref this proj-file)) @@ -288,7 +289,7 @@ added. Possible values are: ;(message "Dirmatch %S not installed." dirmatch) ))))))) -(defmethod ede-auto-load-project ((this ede-project-autoload) dir) +(cl-defmethod ede-auto-load-project ((this ede-project-autoload) dir) "Load in the project associated with THIS project autoload description. THIS project description should be valid for DIR, where the project will be loaded. @@ -315,13 +316,13 @@ NOTE: Do not call this - it should only be called from `ede-load-project-file'." ;; See if we can do without them. ;; @FIXME - delete from loaddefs to remove this. -(defmethod ede-project-root ((this ede-project-autoload)) +(cl-defmethod ede-project-root ((this ede-project-autoload)) "If a project knows its root, return it here. Allows for one-project-object-for-a-tree type systems." nil) ;; @FIXME - delete from loaddefs to remove this. -(defmethod ede-project-root-directory ((this ede-project-autoload) &optional file) +(cl-defmethod ede-project-root-directory ((this ede-project-autoload) &optional file) "" nil) (provide 'ede/auto) |