diff options
Diffstat (limited to 'lisp/cedet/srecode')
| -rw-r--r-- | lisp/cedet/srecode/compile.el | 10 | ||||
| -rw-r--r-- | lisp/cedet/srecode/insert.el | 4 | ||||
| -rw-r--r-- | lisp/cedet/srecode/table.el | 10 | ||||
| -rw-r--r-- | lisp/cedet/srecode/texi.el | 2 |
4 files changed, 16 insertions, 10 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) diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 8dd5d251576..c0260c62a91 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -319,6 +319,10 @@ by themselves.") Specify the :indent argument to enable automatic indentation when newlines occur in your template.") +(cl-defmethod srecord-compile-inserter-newline-p + ((_ srecode-template-inserter-newline)) + t) + (cl-defmethod srecode-insert-method ((sti srecode-template-inserter-newline) dictionary) "Insert the STI inserter." diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el index 3dfbb9d58b1..f77898f9065 100644 --- a/lisp/cedet/srecode/table.el +++ b/lisp/cedet/srecode/table.el @@ -200,13 +200,13 @@ INIT are the initialization parameters for the new template table." ;; go front-to-back, the highest priority items are put ;; 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)))) + (srecode-object-sort-list mt 'modetables (lambda (a b) + (> (oref a priority) + (oref b priority)))) ;; Return it. new)) -(defun object-sort-list (object slot predicate) +(defun srecode-object-sort-list (object slot predicate) "Sort the items in OBJECT's SLOT. Use PREDICATE is the same as for the `sort' function." (when (slot-boundp object slot) @@ -284,6 +284,8 @@ Use PREDICATE is the same as for the `sort' function." (setq temp (cdr temp)))) ) +(define-obsolete-function-alias 'object-sort-list + #'srecode-object-sort-list "29.1") (provide 'srecode/table) diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el index 50b0e150ff3..c297429e408 100644 --- a/lisp/cedet/srecode/texi.el +++ b/lisp/cedet/srecode/texi.el @@ -246,7 +246,7 @@ that class. class => @code{class} @xref{class} unknown => @code{unknown} \"text\" => \\=`\\=`text\\='\\=' - 'quoteme => @code{quoteme} + \\='quoteme => @code{quoteme} non-nil => non-@code{nil} t => @code{t} :tag => @code{:tag} |