1 files changed, 7 insertions, 6 deletions

diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 08082b9ecc1..05f70583c2a 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -199,8 +199,7 @@ STATE is the current compilation state."
         (tag nil)
         (class nil)
         (table nil)
-        (STATE (srecode-compile-state (file-name-nondirectory
-                                       (buffer-file-name))))
+        (STATE (srecode-compile-state))
         (mode nil)
         (application nil)
         (framework nil)
@@ -263,7 +262,7 @@ STATE is the current compilation state."
             ;; Create a compound dictionary value from "value".
             (require 'srecode/dictionary)
             (let ((cv (srecode-dictionary-compound-variable
-                       name :value value)))
+                       :value value)))
               (setq vars (cons (cons name cv) vars)))
             ))
         )
@@ -361,7 +360,7 @@ STATE is the current compile state as an object of class
                              :where 'end)))))))
 
     ;; Construct and return the template object.
-    (srecode-template (semantic-tag-name tag)
+    (srecode-template :object-name (semantic-tag-name tag)
                       :context    context
                       :args       (nreverse addargs)
                       :dictionary root-dict
@@ -504,7 +503,8 @@ PROPS are additional properties that might need to be passed
 to the inserter constructor."
   ;;(message "Compile: %s %S" name props)
   (if (not key)
-      (apply #'make-instance 'srecode-template-inserter-variable name props)
+      (apply #'make-instance 'srecode-template-inserter-variable
+             :object-name name props)
     (let ((classes (eieio-class-children 'srecode-template-inserter))
           (new nil))
       ;; Loop over the various subclasses and
@@ -515,7 +515,8 @@ to the inserter constructor."
         (when (and (not (class-abstract-p (car classes)))
                    (equal (oref-default (car classes) key) key))
           ;; Create the new class, and apply state.
-          (setq new (apply #'make-instance (car classes) name props))
+          (setq new (apply #'make-instance (car classes)
+                           :object-name name props))
           (srecode-inserter-apply-state new STATE)
           )
         (setq classes (cdr classes)))