diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-08-02 10:22:00 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-08-02 13:06:51 -0400 |
commit | 344b48f490416cb1200e19b28d356e7fb5b04387 (patch) | |
tree | f3bb79289f9224b6a06bbdd836e48454b6d4c979 /lisp/cedet/srecode/compile.el | |
parent | 2be7ed257b06539ad3a6180d8c9e57f475455ec8 (diff) | |
download | emacs-344b48f490416cb1200e19b28d356e7fb5b04387.tar.gz emacs-344b48f490416cb1200e19b28d356e7fb5b04387.tar.bz2 emacs-344b48f490416cb1200e19b28d356e7fb5b04387.zip |
CEDET: Remove left-over uses of obsolete <class>-child-p predicates
Those predicates were still sometimes used in a few places, notably via
`:type ... <class>-child` which was never technically correct.
* lisp/cedet/ede/config.el (ede-extra-config, ede-project-with-config):
* lisp/cedet/ede/base.el (ede-project-placeholder): Avoid pseudo-type
`<class>-child`.
* lisp/cedet/semantic/complete.el (semantic-displayer-focus-abstract):
Move before use of `cl-typep` on it.
(semantic-complete-current-match):
* lisp/cedet/ede/speedbar.el (ede-speedbar-menu): Use `cl-typep`
instead of `<class>-child-p`.
* lisp/cedet/semantic/db.el (semanticdb-get-buffer):
Use `cl-defgeneric` for the main/default definition.
(semantic-tag-parent-buffer): Add method.
* lisp/cedet/semantic/tag-file.el (semantic-tag-parent-buffer):
New generic function extracted from `semantic-go-to-tag`.
This allows us to keep the semanticdb-table part in semantic/db and
thus break a cyclic dependency.
(semantic-go-to-tag): Use it.
Demote to a plain `defun` since it's not overloaded anywhere.
* lisp/cedet/semantic/util.el (semanticdb-abstract-table-child-p):
Remove unused declaration.
* lisp/cedet/srecode/compile.el (srecode-template-inserter-newline-child-p):
Remove unused declaration.
(srecord-compile-inserter-newline-p): New generic function, so we can
move the `srecode-template-inserter-newline` case to `srecode/insert.el`,
to avoid a cyclic dependency.
* lisp/cedet/srecode/insert.el (srecord-compile-inserter-newline-p):
New method.
Diffstat (limited to 'lisp/cedet/srecode/compile.el')
-rw-r--r-- | lisp/cedet/srecode/compile.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index 37c83be8112..bed74861ca0 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -38,9 +38,6 @@ (require 'srecode/table) (require 'srecode/dictionary) -(declare-function srecode-template-inserter-newline-child-p "srecode/insert" - t t) - ;;; Code: ;;; Template Class @@ -378,8 +375,11 @@ It is hard if the previous inserter is a newline object." (while (and comp (stringp (car comp))) (setq comp (cdr comp))) (or (not comp) - (progn (require 'srecode/insert) - (srecode-template-inserter-newline-child-p (car comp))))) + (srecord-compile-inserter-newline-p (car comp)))) + +(cl-defgeneric srecord-compile-inserter-newline-p (_obj) + "Non-nil if OBJ is a newline inserter object." + nil) (defun srecode-compile-split-code (tag str STATE &optional end-name) |