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/proj-info.el | |
parent | 102a21d68976ab9dc85304e0bc47b7562d3cf93f (diff) |
* 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/proj-info.el')
-rw-r--r-- | lisp/cedet/ede/proj-info.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el index 692b51b702..a5031ae875 100644 --- a/lisp/cedet/ede/proj-info.el +++ b/lisp/cedet/ede/proj-info.el @@ -72,17 +72,17 @@ All other sources should be included independently.")) ;;; Makefile generation ;; -(defmethod ede-proj-configure-add-missing +(cl-defmethod ede-proj-configure-add-missing ((this ede-proj-target-makefile-info)) "Query if any files needed by THIS provided by automake are missing. Results in --add-missing being passed to automake." (not (ede-expand-filename (ede-toplevel) "texinfo.tex"))) -(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-info)) +(cl-defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-info)) "Return the variable name for THIS's sources." (concat (ede-pmake-varname this) "_TEXINFOS")) -(defmethod ede-proj-makefile-insert-source-variables +(cl-defmethod ede-proj-makefile-insert-source-variables ((this ede-proj-target-makefile-info) &optional moresource) "Insert the source variables needed by THIS info target. Optional argument MORESOURCE is a list of additional sources to add to the @@ -90,7 +90,7 @@ sources variable. Does the usual for Makefile mode, but splits source into two variables when working in Automake mode." (if (not (ede-proj-automake-p)) - (call-next-method) + (cl-call-next-method) (let* ((sv (ede-proj-makefile-sourcevar this)) (src (copy-sequence (oref this source))) (menu (or (oref this menu) (car src)))) @@ -119,7 +119,7 @@ when working in Automake mode." (kill-buffer buffer)) info)) -(defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-info)) +(cl-defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-info)) "Return the name of the main target for THIS target." ;; The target should be the main-menu file name translated to .info. (let* ((source (if (not (string= (oref this mainmenu) "")) @@ -128,7 +128,7 @@ when working in Automake mode." (info (ede-makeinfo-find-info-filename source))) (concat (or info (file-name-sans-extension source)) ".info"))) -(defmethod ede-proj-makefile-insert-dist-dependencies ((this ede-proj-target-makefile-info)) +(cl-defmethod ede-proj-makefile-insert-dist-dependencies ((this ede-proj-target-makefile-info)) "Insert any symbols that the DIST rule should depend on. Texinfo files want to insert generated `.info' files. Argument THIS is the target which needs to insert an info file." @@ -137,7 +137,7 @@ Argument THIS is the target which needs to insert an info file." (insert " " (ede-proj-makefile-target-name this)) ) -(defmethod ede-proj-makefile-insert-dist-filepatterns ((this ede-proj-target-makefile-info)) +(cl-defmethod ede-proj-makefile-insert-dist-filepatterns ((this ede-proj-target-makefile-info)) "Insert any symbols that the DIST rule should depend on. Texinfo files want to insert generated `.info' files. Argument THIS is the target which needs to insert an info file." @@ -151,7 +151,7 @@ Argument THIS is the target which needs to insert an info file." ; n ; (concat n ".info")))) -(defmethod object-write ((this ede-proj-target-makefile-info)) +(cl-defmethod object-write ((this ede-proj-target-makefile-info)) "Before committing any change to THIS, make sure the mainmenu is first." (let ((mm (oref this mainmenu)) (s (oref this source)) @@ -161,9 +161,9 @@ Argument THIS is the target which needs to insert an info file." ;; Make sure that MM is first in the list of items. (setq nl (cons mm (delq mm s))) (oset this source nl))) - (call-next-method)) + (cl-call-next-method)) -(defmethod ede-documentation ((this ede-proj-target-makefile-info)) +(cl-defmethod ede-documentation ((this ede-proj-target-makefile-info)) "Return a list of files that provides documentation. Documentation is not for object THIS, but is provided by THIS for other files in the project." |