aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2025-04-06 17:25:43 -0400
committerStefan Monnier2025-04-07 00:03:20 -0400
commit05680dc6c59be73ebe6c5cfa28d4c095edd661f4 (patch)
tree886ac12b7816338955cde4aa3ffb16958a43fec1
parentf75f8f3d6a09fe3dda3e747665187a0c34c19eaf (diff)
downloademacs-05680dc6c59be73ebe6c5cfa28d4c095edd661f4.tar.gz
emacs-05680dc6c59be73ebe6c5cfa28d4c095edd661f4.zip
cedet: Delete obsolete object name arg to EIEIO constructors
For classes that don't inherit from `eieio-named`, this argument is ignored anyway. * lisp/auth-source-pass.el (auth-source-pass-backend): Delete obsolete object-name argument to `auth-source-backend` constructor. * lisp/cedet/ede/config.el (ede-config-get-configuration): Delete obsolete object-name argument to ede-config constructor. * lisp/cedet/ede/cpp-root.el (ede-find-target): Delete obsolete object-name argument to `ede-cpp-root-target` constructor. * lisp/cedet/ede/locate.el (ede-enable-locate-on-project): Delete obsolete object-name argument to ede-locate constructor. * lisp/cedet/ede/project-am.el (project-am-load-makefile): Delete obsolete object-name argument to `project-am-makefile` constructor. * lisp/cedet/semantic/complete.el (semantic-complete-read-tag-buffer-deep) (semantic-complete-read-tag-local-members) (semantic-complete-read-tag-project, semantic-complete-read-tag-analyzer): Delete obsolete object-name argument to `semantic-collector-buffer-deep`, `semantic-collector-local-members`, `semantic-collector-project-brutish`, and `semantic-collector-analyze-completions` constructors. * lisp/cedet/semantic/db-ebrowse.el (semanticdb-create-database): Delete obsolete object-name argument to `semanticdb-project-database-ebrowse` constructor. * lisp/cedet/semantic/db-file.el (semanticdb-create-database): Delete obsolete object-name argument to `semanticdb-project-database-file` constructor. * lisp/cedet/semantic/db-typecache.el (semanticdb-get-typecache): Delete obsolete object-name argument to `semanticdb-typecache` constructor. * lisp/cedet/semantic/db.el (semanticdb-get-table-index) (semanticdb-create-table): Delete obsolete object-name argument to `semanticdb-default-find-index-class`, new-table-class, and desired-class constructors. * lisp/cedet/semantic/bovine/c.el (semantic-analyze-tag-references): * lisp/cedet/semantic/analyze/refs.el (semantic-analyze-tag-references-default): Delete obsolete object-name argument to `semantic-analyze-references` constructor. * lisp/cedet/srecode/compile.el (srecode-compile-templates): Delete obsolete object-name argument to `srecode-compile-state` and `srecode-dictionary-compound-variable` constructors. * lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict) (srecode-c-apply-templates): Delete obsolete object-name argument to `srecode-semantic-tag` constructors. * lisp/cedet/srecode/dictionary.el (srecode-dictionary-add-entries) (srecode-compound-toString): Delete obsolete object-name argument to `srecode-dictionary-compound-variable` and `srecode-field` constructors. * lisp/cedet/srecode/insert.el (srecode-insert-method-field): Delete obsolete object-name argument to `srecode-field-value` constructor. * lisp/cedet/srecode/semantic.el (srecode-semantic-handle-:tag) (srecode-semantic-insert-tag, srecode-semantic-apply-tag-to-dict-default): Delete obsolete object-name argument to `srecode-semantic-tag` constructors. * lisp/cedet/srecode/table.el (srecode-mode-table-new): Delete obsolete object-name argument to `srecode-template-table` constructor.
-rw-r--r--lisp/auth-source-pass.el1
-rw-r--r--lisp/cedet/ede/config.el9
-rw-r--r--lisp/cedet/ede/cpp-root.el2
-rw-r--r--lisp/cedet/ede/locate.el2
-rw-r--r--lisp/cedet/ede/project-am.el2
-rw-r--r--lisp/cedet/semantic/analyze/refs.el3
-rw-r--r--lisp/cedet/semantic/bovine/c.el3
-rw-r--r--lisp/cedet/semantic/complete.el10
-rw-r--r--lisp/cedet/semantic/db-ebrowse.el6
-rw-r--r--lisp/cedet/semantic/db-file.el4
-rw-r--r--lisp/cedet/semantic/db-typecache.el2
-rw-r--r--lisp/cedet/semantic/db.el4
-rw-r--r--lisp/cedet/srecode/compile.el5
-rw-r--r--lisp/cedet/srecode/cpp.el6
-rw-r--r--lisp/cedet/srecode/dictionary.el4
-rw-r--r--lisp/cedet/srecode/insert.el3
-rw-r--r--lisp/cedet/srecode/semantic.el8
-rw-r--r--lisp/cedet/srecode/table.el1
18 files changed, 24 insertions, 51 deletions
diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index e68a3e9129e..50f80288288 100644
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -149,7 +149,6 @@ HOSTS can be a string or a list of strings."
149 149
150(defvar auth-source-pass-backend 150(defvar auth-source-pass-backend
151 (auth-source-backend 151 (auth-source-backend
152 (when (<= emacs-major-version 25) "password-store")
153 :source "." ;; not used 152 :source "." ;; not used
154 :type 'password-store 153 :type 'password-store
155 :search-function #'auth-source-pass-search) 154 :search-function #'auth-source-pass-search)
diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el
index 89e83386879..fb21baf2985 100644
--- a/lisp/cedet/ede/config.el
+++ b/lisp/cedet/ede/config.el
@@ -154,14 +154,9 @@ the directory isn't on the `safe' list, ask to add it to the safe list."
154 (when (file-exists-p fname) 154 (when (file-exists-p fname)
155 (message "Ignoring EDE config file for now and creating a new one. Use C-c . g to load it.") 155 (message "Ignoring EDE config file for now and creating a new one. Use C-c . g to load it.")
156 ;; Set how it was ignored. 156 ;; Set how it was ignored.
157 (if loadask 157 (setq ignore-type (if loadask 'manual 'auto)))
158 (setq ignore-type 'manual)
159 (setq ignore-type 'auto))
160 )
161 ;; Create a new one. 158 ;; Create a new one.
162 (setq config (make-instance class 159 (setq config (make-instance class :file fname))
163 "Configuration"
164 :file fname))
165 (oset config ignored-file ignore-type) 160 (oset config ignored-file ignore-type)
166 161
167 ;; Set initial values based on project. 162 ;; Set initial values based on project.
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index a43bd2f6f2a..4616d196716 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -327,7 +327,7 @@ If one doesn't exist, create a new one for this directory."
327 (ans (object-assoc dir :path targets)) 327 (ans (object-assoc dir :path targets))
328 ) 328 )
329 (when (not ans) 329 (when (not ans)
330 (setq ans (ede-cpp-root-target dir 330 (setq ans (ede-cpp-root-target
331 :name (file-name-nondirectory 331 :name (file-name-nondirectory
332 (directory-file-name dir)) 332 (directory-file-name dir))
333 :path dir 333 :path dir
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index bad8952ec60..1651b4d3ad3 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -89,7 +89,7 @@ based on `ede-locate-setup-options'."
89 (when (called-interactively-p 'interactive) 89 (when (called-interactively-p 'interactive)
90 (message "Setting locator to ede-locate-base")) 90 (message "Setting locator to ede-locate-base"))
91 (setq ans 'ede-locate-base)) 91 (setq ans 'ede-locate-base))
92 (oset proj locate-obj (make-instance ans "Loc" :root root)) 92 (oset proj locate-obj (make-instance ans :root root))
93 (when (called-interactively-p 'interactive) 93 (when (called-interactively-p 'interactive)
94 (message "Setting locator to %s" ans)) 94 (message "Setting locator to %s" ans))
95 )) 95 ))
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index f45cf1b8616..e66751ba9b1 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -480,7 +480,7 @@ This is used when subprojects are made in named subdirectories."
480 (bug (nth 2 pi)) 480 (bug (nth 2 pi))
481 (cof (nth 3 pi)) 481 (cof (nth 3 pi))
482 (ampf (project-am-makefile 482 (ampf (project-am-makefile
483 pn :name pn 483 :name pn
484 :version ver 484 :version ver
485 :mailinglist (or bug "") 485 :mailinglist (or bug "")
486 :file fn))) 486 :file fn)))
diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el
index 45e74c2b27a..3d3dfdc7975 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -89,8 +89,7 @@ Use `semantic-analyze-current-tag' to debug this fcn."
89 89
90 (setq allhits (semantic--analyze-refs-full-lookup tag scope t)) 90 (setq allhits (semantic--analyze-refs-full-lookup tag scope t))
91 91
92 (semantic-analyze-references (semantic-tag-name tag) 92 (semantic-analyze-references :tag tag
93 :tag tag
94 :tagdb db 93 :tagdb db
95 :scope scope 94 :scope scope
96 :rawsearchdata allhits) 95 :rawsearchdata allhits)
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 81639b98176..659e30a45d9 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1256,8 +1256,7 @@ Use `semantic-analyze-current-tag' to debug this fcn."
1256 (setq allhits (semantic--analyze-refs-full-lookup tag scope t))) 1256 (setq allhits (semantic--analyze-refs-full-lookup tag scope t)))
1257 1257
1258 ;; (setq refs 1258 ;; (setq refs
1259 (semantic-analyze-references (semantic-tag-name tag) 1259 (semantic-analyze-references :tag tag
1260 :tag tag
1261 :tagdb db 1260 :tagdb db
1262 :scope scope 1261 :scope scope
1263 :rawsearchdata allhits)))) ;;) 1262 :rawsearchdata allhits)))) ;;)
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 736025e1d54..e0d16d6fbce 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1899,7 +1899,7 @@ completion text in ghost text."
1899 (mapcar 1899 (mapcar
1900 (lambda (class) 1900 (lambda (class)
1901 (let* ((C (intern (car class))) 1901 (let* ((C (intern (car class)))
1902 (doc (documentation-property C 'variable-documentation)) 1902 (doc (cl--class-docstring (cl--find-class C)))
1903 (doc1 (car (split-string doc "\n"))) 1903 (doc1 (car (split-string doc "\n")))
1904 ) 1904 )
1905 (list 'const 1905 (list 'const
@@ -1930,7 +1930,7 @@ DEFAULT-TAG is a semantic tag or string to use as the default value.
1930If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. 1930If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
1931HISTORY is a symbol representing a variable to store the history in." 1931HISTORY is a symbol representing a variable to store the history in."
1932 (semantic-complete-read-tag-engine 1932 (semantic-complete-read-tag-engine
1933 (semantic-collector-buffer-deep prompt :buffer (current-buffer)) 1933 (semantic-collector-buffer-deep :buffer (current-buffer))
1934 (semantic-displayer-traditional-with-focus-highlight) 1934 (semantic-displayer-traditional-with-focus-highlight)
1935 ;;(semantic-displayer-tooltip) 1935 ;;(semantic-displayer-tooltip)
1936 prompt 1936 prompt
@@ -1952,7 +1952,7 @@ DEFAULT-TAG is a semantic tag or string to use as the default value.
1952If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. 1952If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
1953HISTORY is a symbol representing a variable to store the history in." 1953HISTORY is a symbol representing a variable to store the history in."
1954 (semantic-complete-read-tag-engine 1954 (semantic-complete-read-tag-engine
1955 (semantic-collector-local-members prompt :buffer (current-buffer)) 1955 (semantic-collector-local-members :buffer (current-buffer))
1956 (semantic-displayer-traditional-with-focus-highlight) 1956 (semantic-displayer-traditional-with-focus-highlight)
1957 ;;(semantic-displayer-tooltip) 1957 ;;(semantic-displayer-tooltip)
1958 prompt 1958 prompt
@@ -1974,8 +1974,7 @@ DEFAULT-TAG is a semantic tag or string to use as the default value.
1974If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. 1974If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
1975HISTORY is a symbol representing a variable to store the history in." 1975HISTORY is a symbol representing a variable to store the history in."
1976 (semantic-complete-read-tag-engine 1976 (semantic-complete-read-tag-engine
1977 (semantic-collector-project-brutish prompt 1977 (semantic-collector-project-brutish :buffer (current-buffer)
1978 :buffer (current-buffer)
1979 :path (current-buffer) 1978 :path (current-buffer)
1980 ) 1979 )
1981 (semantic-displayer-traditional-with-focus-highlight) 1980 (semantic-displayer-traditional-with-focus-highlight)
@@ -2049,7 +2048,6 @@ prompts. these are calculated from the CONTEXT variable passed in."
2049 (setq syms (nreverse (cdr (nreverse syms)))) 2048 (setq syms (nreverse (cdr (nreverse syms))))
2050 (semantic-complete-read-tag-engine 2049 (semantic-complete-read-tag-engine
2051 (semantic-collector-analyze-completions 2050 (semantic-collector-analyze-completions
2052 prompt
2053 :buffer (oref context buffer) 2051 :buffer (oref context buffer)
2054 :context context) 2052 :context context)
2055 (semantic-displayer-traditional-with-focus-highlight) 2053 (semantic-displayer-traditional-with-focus-highlight)
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index 3e34f4a1ea1..51e52afa64a 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -309,11 +309,7 @@ If there is no database for DIRECTORY available, then
309 ) 309 )
310 (if found 310 (if found
311 (setq db found) 311 (setq db found)
312 (setq db (make-instance 312 (setq db (make-instance dbeC :ebrowse-struct ebd))
313 dbeC
314 directory
315 :ebrowse-struct ebd
316 ))
317 (oset db reference-directory directory)) 313 (oset db reference-directory directory))
318 314
319 ;; Once we recycle or make a new DB, refresh the 315 ;; Once we recycle or make a new DB, refresh the
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index f15e6e69cb0..3edbc4a2fcd 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -138,10 +138,6 @@ If DIRECTORY doesn't exist, create a new one."
138 (unless db 138 (unless db
139 (setq db (make-instance 139 (setq db (make-instance
140 dbc ; Create the database requested. Perhaps 140 dbc ; Create the database requested. Perhaps
141 (concat (file-name-nondirectory
142 (directory-file-name
143 directory))
144 "/")
145 :file fn :tables nil 141 :file fn :tables nil
146 :semantic-tag-version semantic-tag-version 142 :semantic-tag-version semantic-tag-version
147 :semanticdb-version semanticdb-file-version))) 143 :semanticdb-version semanticdb-file-version)))
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 62eb72af08f..92ddb65ef68 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -136,7 +136,7 @@ If there is no table, create one, and fill it in."
136 ;; Make sure we have a cache object in the DB index. 136 ;; Make sure we have a cache object in the DB index.
137 (when (not cache) 137 (when (not cache)
138 ;; The object won't change as we fill it with stuff. 138 ;; The object won't change as we fill it with stuff.
139 (setq cache (semanticdb-typecache (semanticdb-full-filename table))) 139 (setq cache (semanticdb-typecache))
140 (oset idx type-cache cache)) 140 (oset idx type-cache cache))
141 141
142 cache)) 142 cache))
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index ffbb3431a81..375e43f2561 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -188,7 +188,6 @@ If one doesn't exist, create it."
188 (oref obj index) 188 (oref obj index)
189 (let ((idx nil)) 189 (let ((idx nil))
190 (setq idx (funcall semanticdb-default-find-index-class 190 (setq idx (funcall semanticdb-default-find-index-class
191 (concat (eieio-object-name obj) " index")
192 ;; Fill in the defaults 191 ;; Fill in the defaults
193 :table obj 192 :table obj
194 )) 193 ))
@@ -413,7 +412,6 @@ If the table for FILE does not exist, create one."
413 ;; This implementation will satisfy autoloaded classes 412 ;; This implementation will satisfy autoloaded classes
414 ;; for tables. 413 ;; for tables.
415 (setq newtab (funcall (oref db new-table-class) 414 (setq newtab (funcall (oref db new-table-class)
416 (file-name-nondirectory file)
417 :file (file-name-nondirectory file) 415 :file (file-name-nondirectory file)
418 )) 416 ))
419 (setf (slot-value newtab 'parent-db) db) 417 (setf (slot-value newtab 'parent-db) db)
@@ -486,7 +484,7 @@ other than :table."
486 (if obj 484 (if obj
487 obj ;; Just return it. 485 obj ;; Just return it.
488 ;; No object, let's create a new one and return that. 486 ;; No object, let's create a new one and return that.
489 (setq obj (funcall desired-class "Cache" :table table)) 487 (setq obj (make-instance desired-class :table table))
490 (object-add-to-list table 'cache obj) 488 (object-add-to-list table 'cache obj)
491 obj))) 489 obj)))
492 490
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 9fe499be83a..05f70583c2a 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -199,8 +199,7 @@ STATE is the current compilation state."
199 (tag nil) 199 (tag nil)
200 (class nil) 200 (class nil)
201 (table nil) 201 (table nil)
202 (STATE (srecode-compile-state (file-name-nondirectory 202 (STATE (srecode-compile-state))
203 (buffer-file-name))))
204 (mode nil) 203 (mode nil)
205 (application nil) 204 (application nil)
206 (framework nil) 205 (framework nil)
@@ -263,7 +262,7 @@ STATE is the current compilation state."
263 ;; Create a compound dictionary value from "value". 262 ;; Create a compound dictionary value from "value".
264 (require 'srecode/dictionary) 263 (require 'srecode/dictionary)
265 (let ((cv (srecode-dictionary-compound-variable 264 (let ((cv (srecode-dictionary-compound-variable
266 name :value value))) 265 :value value)))
267 (setq vars (cons (cons name cv) vars))) 266 (setq vars (cons (cons name cv) vars)))
268 )) 267 ))
269 ) 268 )
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index d49ccde24fa..63613969191 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -146,8 +146,7 @@ specified in a C file."
146 (value-dict (srecode-dictionary-add-section-dictionary 146 (value-dict (srecode-dictionary-add-section-dictionary
147 dict "VALUE"))) 147 dict "VALUE")))
148 (srecode-semantic-apply-tag-to-dict 148 (srecode-semantic-apply-tag-to-dict
149 (srecode-semantic-tag (semantic-tag-name value-tag) 149 (srecode-semantic-tag :prime value-tag)
150 :prime value-tag)
151 value-dict)) 150 value-dict))
152 151
153 ;; Discriminate using statements referring to namespaces and 152 ;; Discriminate using statements referring to namespaces and
@@ -224,8 +223,7 @@ specified in a C file."
224 (let ((template-dict (srecode-dictionary-add-section-dictionary 223 (let ((template-dict (srecode-dictionary-add-section-dictionary
225 templates-dict "ARGS"))) 224 templates-dict "ARGS")))
226 (srecode-semantic-apply-tag-to-dict 225 (srecode-semantic-apply-tag-to-dict
227 (srecode-semantic-tag (semantic-tag-name template) 226 (srecode-semantic-tag :prime template)
228 :prime template)
229 template-dict))))) 227 template-dict)))))
230 ) 228 )
231 229
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 2fbed835bdd..bac3b7c48d3 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -369,7 +369,7 @@ values but STATE is nil."
369 (srecode-dictionary-set-value 369 (srecode-dictionary-set-value
370 dict name 370 dict name
371 (srecode-dictionary-compound-variable 371 (srecode-dictionary-compound-variable
372 name :value value :state state))))) 372 :value value :state state)))))
373 (setq entries (nthcdr 2 entries))) 373 (setq entries (nthcdr 2 entries)))
374 dict) 374 dict)
375 375
@@ -536,7 +536,7 @@ inserted with a new editable field.")
536 (error "Unknown default value for value %S" name))) 536 (error "Unknown default value for value %S" name)))
537 537
538 ;; Create a field from the inserter. 538 ;; Create a field from the inserter.
539 (srecode-field name :name name 539 (srecode-field :name name
540 :start start 540 :start start
541 :end (point) 541 :end (point)
542 :prompt (oref sti prompt) 542 :prompt (oref sti prompt)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index a28a4f0e63c..7189ad27c92 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -648,8 +648,7 @@ Use DICTIONARY to resolve values."
648Use DICTIONARY to resolve values." 648Use DICTIONARY to resolve values."
649 (let* ((default (srecode-insert-ask-default sti dictionary)) 649 (let* ((default (srecode-insert-ask-default sti dictionary))
650 (compound-value 650 (compound-value
651 (srecode-field-value (oref sti object-name) 651 (srecode-field-value :firstinserter sti
652 :firstinserter sti
653 :defaultvalue default)) 652 :defaultvalue default))
654 ) 653 )
655 ;; Return this special compound value as the thing to insert. 654 ;; Return this special compound value as the thing to insert.
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index bfacda54557..1db041cdfd0 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -129,8 +129,7 @@ variable default values, and other things."
129 larg nil nil))) 129 larg nil nil)))
130 ;; Apply the sub-argument to the subdictionary. 130 ;; Apply the sub-argument to the subdictionary.
131 (srecode-semantic-apply-tag-to-dict 131 (srecode-semantic-apply-tag-to-dict
132 (srecode-semantic-tag (semantic-tag-name larg) 132 (srecode-semantic-tag :prime larg)
133 :prime larg)
134 subdict) 133 subdict)
135 ) 134 )
136 ;; Next! 135 ;; Next!
@@ -203,8 +202,7 @@ variable default values, and other things."
203 (when (not tag) 202 (when (not tag)
204 (error "No tag for current template. Use the semantic kill-ring")) 203 (error "No tag for current template. Use the semantic kill-ring"))
205 (srecode-semantic-apply-tag-to-dict 204 (srecode-semantic-apply-tag-to-dict
206 (srecode-semantic-tag (semantic-tag-name tag) 205 (srecode-semantic-tag :prime tag)
207 :prime tag)
208 dict))) 206 dict)))
209 207
210;;; :tagtype ARGUMENT HANDLING 208;;; :tagtype ARGUMENT HANDLING
@@ -394,7 +392,7 @@ as `function' will leave point where code might be inserted."
394 ;; Resolve TAG into the dictionary. We may have a :tag arg 392 ;; Resolve TAG into the dictionary. We may have a :tag arg
395 ;; from the macro such that we don't need to do this. 393 ;; from the macro such that we don't need to do this.
396 (when (not (srecode-dictionary-lookup-name dict "TAG")) 394 (when (not (srecode-dictionary-lookup-name dict "TAG"))
397 (let ((tagobj (srecode-semantic-tag (semantic-tag-name tag) :prime tag)) 395 (let ((tagobj (srecode-semantic-tag :prime tag))
398 ) 396 )
399 (srecode-semantic-apply-tag-to-dict tagobj dict))) 397 (srecode-semantic-apply-tag-to-dict tagobj dict)))
400 398
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index ba87c0a01d2..6f98038b614 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -180,7 +180,6 @@ INIT are the initialization parameters for the new template table."
180 (old (srecode-mode-table-find mt file)) 180 (old (srecode-mode-table-find mt file))
181 (attr (file-attributes file)) 181 (attr (file-attributes file))
182 (new (apply #'srecode-template-table 182 (new (apply #'srecode-template-table
183 (file-name-nondirectory file)
184 :file file 183 :file file
185 :filesize (file-attribute-size attr) 184 :filesize (file-attribute-size attr)
186 :filedate (file-attribute-modification-time attr) 185 :filedate (file-attribute-modification-time attr)