diff options
Diffstat (limited to 'lisp/cedet')
| -rw-r--r-- | lisp/cedet/ede/config.el | 5 | ||||
| -rw-r--r-- | lisp/cedet/srecode/srt-mode.el | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el index eb46be7a693..c8bf7f33bae 100644 --- a/lisp/cedet/ede/config.el +++ b/lisp/cedet/ede/config.el @@ -406,13 +406,14 @@ java class path.") () "Class to mix into a project to support java.") +(eieio-declare-slots classpath) + (cl-defmethod ede-java-classpath ((proj ede-project-with-config-java)) "Return the classpath for this project." ;; The `classpath' slot only exists in the Java parts of cedet, and ;; those have not been merged into Emacs. Suppress the warning ;; about the unknown slot by using `intern'. - (slot-value (ede-config-get-configuration proj) - (intern "classpath" obarray))) + (oref (ede-config-get-configuration proj) classpath)) ;; Local variables: ;; generated-autoload-file: "loaddefs.el" diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 0179929e7a9..5e7c7c111a3 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -229,6 +229,7 @@ we can tell font lock about them.") (insert ee)))) ) +(eieio-declare-slots key) (defun srecode-macro-help () "Provide help for working with macros in a template." @@ -247,9 +248,7 @@ we can tell font lock about them.") (let* ((C (car chl)) (name (symbol-name C)) (key (when (slot-exists-p C 'key) - ;; This avoids a compilation warning, but we - ;; know that 'key exists here. - (slot-value C (intern "key" obarray)))) + (oref C key))) (showexample t)) (setq chl (cdr chl)) (setq chl (append (eieio-class-children C) chl)) @@ -512,9 +511,7 @@ section or ? for an ask variable." ":") nil))) (key (when (slot-exists-p inserter 'key) - ;; This avoids a compilation warning, but we - ;; know that 'key exists here. - (slot-value inserter (intern "key" obarray))))) + (oref inserter key)))) (cond ((null key) ;; A plain variable (cons nil base)) |