Merge with CEDET upstream (rev. 8499).

[bpt/emacs.git] / lisp / cedet / srecode / insert.el

diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 466efae..0d647bb 100644 (file)
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -809,7 +809,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
     (srecode-insert-report-error
      dict
      "Only section dictionaries allowed for `%s'"
-     (object-name-string sti)))
+     (eieio-object-name-string sti)))
 
   ;; Output the code from the sub-template.
   (srecode-insert-method (slot-value sti slot) dict))
@@ -866,7 +866,7 @@ Return the remains of INPUT."
   (let* ((out (srecode-compile-split-code tag input STATE
                                          (oref ins :object-name))))
     (oset ins template (srecode-template
-                       (object-name-string ins)
+                       (eieio-object-name-string ins)
                        :context nil
                        :args nil
                        :code (cdr out)))