CEDET: Fix "unknown slot [...]" warningsscratch/last-cedet-merge

Replace (oref OBJECT :SLOT) with (slot-value OBJECT 'SLOT).

TODO: ChangeLog

13 files changed, 69 insertions, 69 deletions

diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index facf96e9afb..9fc1b810827 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -174,7 +174,7 @@ do not contain any text from preceding or following text."
 	  (srecode-dictionary-set-value dict "PROJECT_FILENAME" relfname)
 	  (srecode-dictionary-set-value dict "PROJECT_DIRECTORY" reldir)
 	  (srecode-dictionary-set-value dict "PROJECT_NAME" (ede-name (ede-toplevel)))
-	  (srecode-dictionary-set-value dict "PROJECT_VERSION" (oref (ede-toplevel) :version))
+	  (srecode-dictionary-set-value dict "PROJECT_VERSION" (slot-value (ede-toplevel) 'version))
 	  )
       ;; If there is no EDE project, then put in some base values.
       (srecode-dictionary-set-value dict "PROJECT_FILENAME" bfn)
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 1b6cd704095..9bd47153294 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -548,8 +548,8 @@ A list of defined variables VARS provides a variable table."
 
     (while lp
 
-      (let* ((objname (oref (car lp) :object-name))
-	     (context (oref (car lp) :context))
+      (let* ((objname (slot-value (car lp) 'object-name))
+	     (context (slot-value (car lp) 'context))
 	     (globalname (concat context ":" objname))
 	     )
 
@@ -645,9 +645,9 @@ Argument INDENT specifies the indentation level for the list."
   "Dump the state of the SRecode template inserter INS."
   (princ "INS: \"")
   (princ (eieio-object-name-string ins))
-  (when (oref ins :secondname)
+  (when (slot-value ins 'secondname)
     (princ "\" : \"")
-    (princ (oref ins :secondname)))
+    (princ (slot-value ins 'secondname)))
   (princ "\" type \"")
   (let* ((oc (symbol-name (eieio-object-class ins)))
 	 (junk (string-match "srecode-template-inserter-" oc))
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index 8f9c0832844..9f675fcaf9e 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -122,7 +122,7 @@ specified in a C file."
   (srecode-semantic-apply-tag-to-dict-default tag-wrapper dict)
 
   ;; Pull out the tag for the individual pieces.
-  (let* ((tag   (oref tag-wrapper :prime))
+  (let* ((tag   (slot-value tag-wrapper 'prime))
 	 (class (semantic-tag-class tag)))
 
     ;; Add additional information based on the class of the tag.
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 2844c1b52da..5e581312fdd 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -123,7 +123,7 @@ Makes sure that :value is compiled."
 
     (cl-call-next-method this (nreverse newfields))
     (when (not (slot-boundp this 'compiled))
-      (let ((val (oref this :value))
+      (let ((val (slot-value this 'value))
 	    (comp nil))
 	(while val
 	  (let ((nval (car val))
@@ -224,7 +224,7 @@ TPL is an object representing a compiled template file."
     ;; Tables are sorted with highest priority first, useful for looking
     ;; up templates, but this means we need to install the variables in
     ;; reverse order so higher priority variables override lower ones.
-    (let ((tabs (reverse (oref tpl :tables))))
+    (let ((tabs (reverse (slot-value tpl 'tables))))
       (require 'srecode/find) ; For srecode-template-table-in-project-p
       (while tabs
 	(when (srecode-template-table-in-project-p (car tabs))
@@ -519,7 +519,7 @@ inserted with a new editable field.")
     (let* ((dv (oref cp defaultvalue))
 	   (sti (oref cp firstinserter))
 	   (start (point))
-	   (name (oref sti :object-name)))
+	   (name (slot-value sti 'object-name)))
 
       (cond
        ;; No default value.
diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el
index 526a2a21070..50b880ddc31 100644
--- a/lisp/cedet/srecode/el.el
+++ b/lisp/cedet/srecode/el.el
@@ -86,7 +86,7 @@ Calls `srecode-semantic-apply-tag-to-dict-default' first."
   (srecode-semantic-apply-tag-to-dict-default tagobj dict)
 
   ;; Pull out the tag for the individual pieces.
-  (let* ((tag (oref tagobj :prime))
+  (let* ((tag (slot-value tagobj 'prime))
 	 (doc (semantic-tag-docstring tag)))
 
     ;; It is much more common to have doc on ELisp.
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index cd41afef6e2..df857e5e591 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -161,7 +161,7 @@ Return nil as this inserter will extract nothing."
 Return t if something was extracted.
 Return nil if this inserter doesn't need to extract anything."
   (srecode-dictionary-set-value vdict
-				(oref ins :object-name)
+				(slot-value ins 'object-name)
 				(buffer-substring-no-properties
 				 start end)
 				)
@@ -178,7 +178,7 @@ Return nil if this inserter doesn't need to extract anything."
   "Extract text from START/END and store in INDICT.
 Return the starting location of the first plain-text match.
 Return nil if nothing was extracted."
-  (let ((name (oref ins :object-name))
+  (let ((name (slot-value ins 'object-name))
 	(subdict (srecode-create-dictionary indict))
 	(allsubdict nil)
 	)
@@ -217,10 +217,10 @@ Return nil if nothing was extracted."
   ;; There are two modes for includes.  One is with no dict,
   ;; so it is inserted straight.  If the dict has a name, then
   ;; we need to run once per dictionary occurrence.
-  (if (not (string= (oref ins :object-name) ""))
+  (if (not (string= (slot-value ins 'object-name) ""))
       ;; With a name, do the insertion.
       (let ((subdict (srecode-dictionary-add-section-dictionary
-		      dict (oref ins :object-name))))
+		      dict (slot-value ins 'object-name))))
 	(error "Need to implement include w/ name extractor")
 	;; Recurse into the new template while no errors.
 	(while (condition-case nil
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index 913013c259c..de3e3e71bba 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -100,7 +100,7 @@ all template files for that application will be loaded."
   "Return non-nil if the table TAB can be used in the current project.
 If TAB has a :project set, check that the directories match.
 If TAB is nil, then always return t."
-  (let ((proj (oref tab :project)))
+  (let ((proj (slot-value tab 'project)))
     ;; Return t if the project wasn't set.
     (if (not proj) t
       ;; If the project directory was set, let's check it.
@@ -139,10 +139,10 @@ Optional argument APPLICATION restricts searches to only template tables
 belonging to a specific application.  If APPLICATION is nil, then only
 tables that do not belong to an application will be searched."
   (let* ((mt tab)
-	 (tabs (oref mt :tables))
+	 (tabs (slot-value mt 'tables))
 	 (ans nil))
     (while (and (not ans) tabs)
-      (let ((app (oref (car tabs) :application)))
+      (let ((app (slot-value (car tabs) 'application)))
 	(when (or (and (not application) (null app))
 		  (and application (eq app application)))
 	  (setq ans (srecode-template-get-table (car tabs) template-name
@@ -150,7 +150,7 @@ tables that do not belong to an application will be searched."
 	(setq tabs (cdr tabs))))
     (or ans
 	;; Recurse to the default.
-	(when (not (equal (oref tab :major-mode) 'default))
+	(when (not (equal (slot-value tab 'major-mode) 'default))
 	  (srecode-template-get-table (srecode-get-mode-table 'default)
 				      template-name context application)))))
 
@@ -199,10 +199,10 @@ Optional argument APPLICATION restricts searches to only template tables
 belonging to a specific application.  If APPLICATION is nil, then only
 tables that do not belong to an application will be searched."
   (let* ((mt tab)
-	 (tabs (oref mt :tables))
+	 (tabs (slot-value mt 'tables))
 	 (ans nil))
     (while (and (not ans) tabs)
-      (let ((app (oref (car tabs) :application)))
+      (let ((app (slot-value (car tabs) 'application)))
 	(when (or (and (not application) (null app))
 		  (and application (eq app application)))
 	  (setq ans (srecode-template-get-table-for-binding
@@ -210,7 +210,7 @@ tables that do not belong to an application will be searched."
 	(setq tabs (cdr tabs))))
     (or ans
 	;; Recurse to the default.
-	(when (not (equal (oref tab :major-mode) 'default))
+	(when (not (equal (slot-value tab 'major-mode) 'default))
 	  (srecode-template-get-table-for-binding
 	   (srecode-get-mode-table 'default) binding context)))))
 ;;; Interactive
@@ -241,10 +241,10 @@ templates."
 
     ;; Load up the hash table for our current mode.
     (let* ((mt   (srecode-get-mode-table mmode))
-	   (tabs (when mt (oref mt :tables))))
+	   (tabs (when mt (slot-value mt 'tables))))
       (dolist (tab tabs)
 	;; Exclude templates for a particular application.
-	(when (and (not (oref tab :application))
+	(when (and (not (slot-value tab 'application))
 		   (srecode-template-table-in-project-p tab))
 	  (maphash (lambda (key temp)
 		     (when (or (not predicate)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index c582e328b2b..e9c0a53721c 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -474,8 +474,8 @@ If SECONDNAME is nil, return VALUE."
 				  dictionary)
   "Insert the STI inserter."
   ;; Convert the name into a name/fcn pair
-  (let* ((name (oref sti :object-name))
-	 (fcnpart (oref sti :secondname))
+  (let* ((name (slot-value sti 'object-name))
+	 (fcnpart (slot-value sti 'secondname))
 	 (val (srecode-dictionary-lookup-name
 	       dictionary name))
 	 (do-princ t)
@@ -548,7 +548,7 @@ Loop over the prompts to see if we have a match."
 	)
     (while prompts
       (when (string= (semantic-tag-name (car prompts))
-		     (oref ins :object-name))
+		     (slot-value ins 'object-name))
 	(oset ins :prompt
 	      (semantic-tag-get-attribute (car prompts) :text))
 	(oset ins :defaultfcn
@@ -564,7 +564,7 @@ Loop over the prompts to see if we have a match."
 				  dictionary)
   "Insert the STI inserter."
   (let ((val (srecode-dictionary-lookup-name
-	      dictionary (oref sti :object-name))))
+	      dictionary (slot-value sti 'object-name))))
     (if val
 	;; Does some extra work.  Oh well.
 	(cl-call-next-method)
@@ -580,7 +580,7 @@ Loop over the prompts to see if we have a match."
       ;; the user can use the same name again later.
       (srecode-dictionary-set-value
        (srecode-root-dictionary dictionary)
-       (oref sti :object-name) val)
+       (slot-value sti 'object-name) val)
 
       ;; Now that this value is safely stowed in the dictionary,
       ;; we can do what regular inserters do.
@@ -590,7 +590,7 @@ Loop over the prompts to see if we have a match."
 				       dictionary)
   "Derive the default value for an askable inserter STI.
 DICTIONARY is used to derive some values."
-  (let ((defaultfcn (oref sti :defaultfcn)))
+  (let ((defaultfcn (slot-value sti 'defaultfcn)))
     (cond
      ((stringp defaultfcn)
       defaultfcn)
@@ -617,13 +617,13 @@ DICTIONARY is used to derive some values."
 Use DICTIONARY to resolve values."
   (let* ((prompt (oref sti prompt))
 	 (default (srecode-insert-ask-default sti dictionary))
-	 (reader (oref sti :read-fcn))
+	 (reader (slot-value sti 'read-fcn))
 	 (val nil)
 	 )
     (cond ((eq reader 'y-or-n-p)
 	   (if (y-or-n-p (or prompt
 			     (format "%s? "
-				     (oref sti :object-name))))
+				     (slot-value sti 'object-name))))
 	       (setq val default)
 	     (setq val "")))
 	  ((eq reader 'read-char)
@@ -631,14 +631,14 @@ Use DICTIONARY to resolve values."
 		      "%c"
 		      (read-char (or prompt
 				     (format "Char for %s: "
-					     (oref sti :object-name))))))
+					     (slot-value sti 'object-name))))))
 	   )
 	  (t
 	   (save-excursion
 	     (setq val (funcall reader
 				(or prompt
 				    (format "Specify %s: "
-					    (oref sti :object-name)))
+					    (slot-value sti 'object-name)))
 				default
 				)))))
     ;; Return our derived value.
@@ -651,7 +651,7 @@ Use DICTIONARY to resolve values."
 Use DICTIONARY to resolve values."
   (let* ((default (srecode-insert-ask-default sti dictionary))
 	 (compound-value
-	  (srecode-field-value (oref sti :object-name)
+	  (srecode-field-value (slot-value sti 'object-name)
 			       :firstinserter sti
 			       :defaultvalue default))
 	 )
@@ -819,12 +819,12 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
 Loops over the embedded CODE which was saved here during compilation.
 The template to insert is stored in SLOT."
   (let ((dicts (srecode-dictionary-lookup-name
-		dictionary (oref sti :object-name))))
+		dictionary (slot-value sti 'object-name))))
     (when (not (listp dicts))
       (srecode-insert-report-error
        dictionary
        "Cannot insert section %S from non-section variable."
-       (oref sti :object-name)))
+       (slot-value sti 'object-name)))
     ;; If there is no section dictionary, then don't output anything
     ;; from this section.
     (while dicts
@@ -832,7 +832,7 @@ The template to insert is stored in SLOT."
 	(srecode-insert-report-error
 	 dictionary
 	 "Cannot insert section %S from non-section variable."
-	 (oref sti :object-name)))
+	 (slot-value sti 'object-name)))
       (srecode-insert-subtemplate sti (car dicts) slot)
       (setq dicts (cdr dicts)))))
 
@@ -863,7 +863,7 @@ applied to the text between the section start and the
 Shorten input until the END token is found.
 Return the remains of INPUT."
   (let* ((out (srecode-compile-split-code tag input STATE
-					  (oref ins :object-name))))
+					  (slot-value ins 'object-name))))
     (oset ins template (srecode-template
 			(eieio-object-name-string ins)
 			:context nil
@@ -896,7 +896,7 @@ are treated specially.")
 (cl-defmethod srecode-match-end ((ins srecode-template-inserter-section-end) name)
 
   "For the template inserter INS, do I end a section called NAME?"
-  (string= name (oref ins :object-name)))
+  (string= name (slot-value ins 'object-name)))
 
 (defclass srecode-template-inserter-include (srecode-template-inserter-subtemplate)
   ((key :initform ?>
@@ -927,13 +927,13 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   "For the template inserter STI, lookup the template to include.
 Finds the template with this macro function part and stores it in
 this template instance."
-  (let ((templatenamepart (oref sti :secondname)))
+  (let ((templatenamepart (slot-value sti 'secondname)))
     ;; If there was no template name, throw an error.
     (unless templatenamepart
       (srecode-insert-report-error
        dictionary
        "Include macro `%s' needs a template name"
-       (oref sti :object-name)))
+       (slot-value sti 'object-name)))
 
     ;; NOTE: We used to cache the template and not look it up a second time,
     ;; but changes in the template tables can change which template is
@@ -978,7 +978,7 @@ this template instance."
       (srecode-insert-report-error
        dictionary
        "No template \"%s\" found for include macro `%s'"
-       templatenamepart (oref sti :object-name)))))
+       templatenamepart (slot-value sti 'object-name)))))
 
 (cl-defmethod srecode-insert-method ((sti srecode-template-inserter-include)
 				  dictionary)
@@ -988,7 +988,7 @@ with the dictionaries found in the dictionary."
   (srecode-insert-include-lookup sti dictionary)
   ;; Insert the template.
   ;; Our baseclass has a simple way to do this.
-  (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name))
+  (if (srecode-dictionary-lookup-name dictionary (slot-value sti 'object-name))
       ;; If we have a value, then call the next method
       (srecode-insert-method-helper sti dictionary 'includedtemplate)
     ;; If we don't have a special dictionary, then just insert with the
@@ -1057,7 +1057,7 @@ template where a ^ inserter occurs."
 	    (lambda (dict)
 	      (let ((srecode-template-inserter-point-override nil))
 		(if (srecode-dictionary-lookup-name
-		     dict (oref inserter1 :object-name))
+		     dict (slot-value inserter1 'object-name))
 		    ;; Insert our sectional part with looping.
 		    (srecode-insert-method-helper
 		     inserter1 dict 'template)
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 566ab5d366a..c92c45fa885 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -196,7 +196,7 @@ MENU-DEF is the menu to bind this into."
   ;;(srecode-load-tables-for-mode major-mode)
 
   (let* ((modetable (srecode-get-mode-table major-mode))
-	 (subtab (when modetable (oref modetable :tables)))
+	 (subtab (when modetable (slot-value modetable 'tables)))
 	 (context nil)
 	 (active nil)
 	 (ltab nil)
@@ -319,17 +319,17 @@ Template is chosen based on the mode of the starting buffer."
       (if (not temp)
 	  (error "No Template named %s" template-name))
       ;; We need a template specific table, since tables chain.
-      (let ((tab (oref temp :table))
+      (let ((tab (slot-value temp 'table))
 	    (names nil)
 	    )
-	(find-file (oref tab :file))
-	(setq names (semantic-find-tags-by-name (oref temp :object-name)
+	(find-file (slot-value tab 'file))
+	(setq names (semantic-find-tags-by-name (slot-value temp 'object-name)
 						(current-buffer)))
 	(cond ((= (length names) 1)
 	       (semantic-go-to-tag (car names))
 	       (semantic-momentary-highlight-tag (car names)))
 	      ((> (length names) 1)
-	       (let* ((ctxt (semantic-find-tags-by-name (oref temp :context)
+	       (let* ((ctxt (semantic-find-tags-by-name (slot-value temp 'context)
 							(current-buffer)))
 		      (cls (semantic-find-tags-by-class 'context ctxt))
 		      )
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 7e24a320483..9500ca35979 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -63,9 +63,9 @@ If FUNCTION is non-nil, then FUNCTION is somehow applied to an
 aspect of the compound value."
   (if (not function)
       ;; Just format it in some handy dandy way.
-      (semantic-format-tag-prototype (oref cp :prime))
+      (semantic-format-tag-prototype (slot-value cp 'prime))
     ;; Otherwise, apply the function to the tag itself.
-    (funcall function (oref cp :prime))
+    (funcall function (slot-value cp 'prime))
     ))
 
 
@@ -106,7 +106,7 @@ variable default values, and other things."
   (srecode-dictionary-set-value dict "TAG" tagobj)
 
   ;; Pull out the tag for the individual pieces.
-  (let ((tag (oref tagobj :prime)))
+  (let ((tag (slot-value tagobj 'prime)))
 
     (srecode-dictionary-set-value dict "NAME" (semantic-tag-name tag))
     (srecode-dictionary-set-value dict "TYPE" (semantic-format-tag-type tag nil))
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 1a5a656e29a..2b0672a52c5 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -502,10 +502,10 @@ section or ? for an ask variable."
 		 )
 	    (when inserter
 	      (let ((base
-		     (cons (oref inserter :object-name)
+		     (cons (slot-value inserter 'object-name)
 			   (if (and (slot-boundp inserter :secondname)
-				    (oref inserter :secondname))
-			       (split-string (oref inserter :secondname)
+				    (slot-value inserter 'secondname))
+			       (split-string (slot-value inserter 'secondname)
 					     ":")
 			     nil)))
 		    (key (oref inserter key)))
@@ -629,7 +629,7 @@ section or ? for an ask variable."
   "Return a list of possible completions based on NONTEXT.
 Any extra FLAGS are ignored."
   (with-current-buffer (oref context buffer)
-    (let* ((prefix (car (last (oref context :prefix))))
+    (let* ((prefix (car (last (slot-value context 'prefix))))
 	   (prefixstr (cond ((stringp prefix)
 			     prefix)
 			    ((semantic-tag-p prefix)
@@ -640,7 +640,7 @@ Any extra FLAGS are ignored."
 ;				prefix)
 ;			       ((stringp (car prefix))
 ;				(car prefix))))
-	   (argtype (car (oref context :argument)))
+	   (argtype (car (slot-value context 'argument)))
 	   (matches nil))
 
       ;; Depending on what the analyzer is, we have different ways
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index 98e0c2d1d14..82b76400522 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -201,8 +201,8 @@ INIT are the initialization parameters for the new template table."
     ;; into the search table first, allowing lower priority items
     ;; to be the items found in the search table.
     (object-sort-list mt 'modetables (lambda (a b)
-				       (> (oref a :priority)
-					  (oref b :priority))))
+				       (> (slot-value a 'priority)
+					  (slot-value b 'priority))))
     ;; Return it.
     new))
 
@@ -239,9 +239,9 @@ Use PREDICATE is the same as for the `sort' function."
 (cl-defmethod srecode-dump ((tab srecode-mode-table))
   "Dump the contents of the SRecode mode table TAB."
   (princ "MODE TABLE FOR ")
-  (princ (oref tab :major-mode))
+  (princ (slot-value tab 'major-mode))
   (princ "\n--------------------------------------------\n\nNumber of tables: ")
-  (let ((subtab (oref tab :tables)))
+  (let ((subtab (slot-value tab 'tables)))
     (princ (length subtab))
     (princ "\n\n")
     (while subtab
@@ -254,17 +254,17 @@ Use PREDICATE is the same as for the `sort' function."
   (princ "Template Table for ")
   (princ (eieio-object-name-string tab))
   (princ "\nPriority: ")
-  (prin1 (oref tab :priority))
-  (when (oref tab :application)
+  (prin1 (slot-value tab 'priority))
+  (when (slot-value tab 'application)
     (princ "\nApplication: ")
-    (princ (oref tab :application)))
-  (when (oref tab :framework)
+    (princ (slot-value tab 'application)))
+  (when (slot-value tab 'framework)
     (princ "\nFramework: ")
-    (princ (oref tab :framework)))
-  (when (oref tab :project)
+    (princ (slot-value tab 'framework)))
+  (when (slot-value tab 'project)
     (require 'srecode/find) ; For srecode-template-table-in-project-p
     (princ "\nProject Directory: ")
-    (princ (oref tab :project))
+    (princ (slot-value tab 'project))
     (when (not (srecode-template-table-in-project-p tab))
       (princ "\n   ** Not Usable in this file. **")))
   (princ "\n\nVariables:\n")
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 5cc57bebee5..7220ce6b0c4 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -156,7 +156,7 @@ Adds the following:
       (error "No tag to insert for :texitag template argument"))
 
     ;; Extract the tag out of the compound object.
-    (setq tag (oref tag :prime))
+    (setq tag (slot-value tag 'prime))
 
     ;; Extract the doc string
     (setq doc (semantic-documentation-for-tag tag))