Update copyright year to 2016

[gnu-emacs] / lisp / cedet / srecode / insert.el

diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 0d647bb56c5379b9240311e9673c9aa321ee5f63..19999a6fd993888906d9e80c1339b4f27b10fece 100644 (file)
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -1,6 +1,6 @@
 ;;; srecode/insert.el --- Insert srecode templates to an output stream.
 
 ;;; srecode/insert.el --- Insert srecode templates to an output stream.
 

-;; Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2016 Free Software Foundation, Inc.

 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 


@@ -35,7 +35,6 @@
 (require 'srecode/args)
 (require 'srecode/filters)
 
 (require 'srecode/args)
 (require 'srecode/filters)
 

-(defvar srecode-template-inserter-point)

 (declare-function srecode-overlaid-activate "srecode/fields")
 (declare-function srecode-template-inserted-region "srecode/fields")
 
 (declare-function srecode-overlaid-activate "srecode/fields")
 (declare-function srecode-template-inserted-region "srecode/fields")
 


@@ -46,9 +45,9 @@
 Only the ASK style inserter will query the user for a value.
 Dictionary value references that ask begin with the ? character.
 Possible values are:
 Only the ASK style inserter will query the user for a value.
 Dictionary value references that ask begin with the ? character.
 Possible values are:

-  'ask   - Prompt in the minibuffer as the value is inserted.
-  'field - Use the dictionary macro name as the inserted value,
-           and place a field there.  Matched fields change together.
+  `ask'   - Prompt in the minibuffer as the value is inserted.
+  `field' - Use the dictionary macro name as the inserted value,
+            and place a field there.  Matched fields change together.

 
 NOTE: The field feature does not yet work with XEmacs."
   :group 'srecode
 
 NOTE: The field feature does not yet work with XEmacs."
   :group 'srecode


@@ -145,7 +144,7 @@ has set everything up already."
               )
       (set-buffer standard-output)
       (setq end-mark (point-marker))
               )
       (set-buffer standard-output)
       (setq end-mark (point-marker))

-      (goto-char  (oref srecode-template-inserter-point point)))
+      (goto-char  (oref-default 'srecode-template-inserter-point point)))

     (oset-default 'srecode-template-inserter-point point eieio-unbound)
 
     ;; Return the end-mark.
     (oset-default 'srecode-template-inserter-point point eieio-unbound)
 
     ;; Return the end-mark.


@@ -211,13 +210,13 @@ insertions."
            (propertize " (most recent at bottom)" 'face '(:slant italic))
            ":\n")
     (data-debug-insert-stuff-list
            (propertize " (most recent at bottom)" 'face '(:slant italic))
            ":\n")
     (data-debug-insert-stuff-list

-     (reverse (oref srecode-template active)) "> ")
+     (reverse (oref-default 'srecode-template active)) "> ")

     ;; Show the current dictionary.
     (insert (propertize "Dictionary" 'face '(:weight bold)) "\n")
     (data-debug-insert-thing dictionary "" "> ")
     ;; Show the error message.
     (insert (propertize "Error" 'face '(:weight bold)) "\n")
     ;; Show the current dictionary.
     (insert (propertize "Dictionary" 'face '(:weight bold)) "\n")
     (data-debug-insert-thing dictionary "" "> ")
     ;; Show the error message.
     (insert (propertize "Error" 'face '(:weight bold)) "\n")

-    (insert (apply #'format format args))
+    (insert (apply #'format-message format args))

     (pop-to-buffer (current-buffer))))
 
 (defun srecode-insert-report-error (dictionary format &rest args)
     (pop-to-buffer (current-buffer))))
 
 (defun srecode-insert-report-error (dictionary format &rest args)


@@ -260,20 +259,19 @@ Optional argument TEMP is the template that is getting its arguments resolved."
 ;; Code managing the top-level insert method and the current
 ;; insertion stack.
 ;;
 ;; Code managing the top-level insert method and the current
 ;; insertion stack.
 ;;

-(defmethod srecode-push ((st srecode-template))
+(cl-defmethod srecode-push ((st srecode-template))

   "Push the srecoder template ST onto the active stack."
   (oset st active (cons st (oref st active))))
 
   "Push the srecoder template ST onto the active stack."
   (oset st active (cons st (oref st active))))
 

-(defmethod srecode-pop :STATIC ((st srecode-template))
-  "Pop the srecoder template ST onto the active stack.
-ST can be a class, or an object."
+(cl-defmethod srecode-pop ((st srecode-template))
+  "Pop the srecoder template ST onto the active stack."

   (oset st active (cdr (oref st active))))
 
   (oset st active (cdr (oref st active))))
 

-(defmethod srecode-peek :STATIC ((st srecode-template))
-  "Fetch the topmost active template record.  ST can be a class."
+(cl-defmethod srecode-peek ((st srecode-template))
+  "Fetch the topmost active template record."

   (car (oref st active)))
 
   (car (oref st active)))
 

-(defmethod srecode-insert-method ((st srecode-template) dictionary)
+(cl-defmethod srecode-insert-method ((st srecode-template) dictionary)

   "Insert the srecoder template ST."
   ;; Merge any template entries into the input dictionary.
   ;; This may happen twice since some templates arguments need
   "Insert the srecoder template ST."
   ;; Merge any template entries into the input dictionary.
   ;; This may happen twice since some templates arguments need


@@ -324,7 +322,7 @@ by themselves.")
 Specify the :indent argument to enable automatic indentation when newlines
 occur in your template.")
 
 Specify the :indent argument to enable automatic indentation when newlines
 occur in your template.")
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-newline)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-newline)

                                  dictionary)
   "Insert the STI inserter."
   ;; To be safe, indent the previous line since the template will
                                  dictionary)
   "Insert the STI inserter."
   ;; To be safe, indent the previous line since the template will


@@ -363,9 +361,9 @@ occur in your template.")
            ((stringp i)
             (princ i))))))
 
            ((stringp i)
             (princ i))))))
 

-(defmethod srecode-dump ((ins srecode-template-inserter-newline) indent)
+(cl-defmethod srecode-dump ((ins srecode-template-inserter-newline) _indent)

   "Dump the state of the SRecode template inserter INS."
   "Dump the state of the SRecode template inserter INS."

-  (call-next-method)
+  (cl-call-next-method)

   (when (oref ins hard)
     (princ " : hard")
     ))
   (when (oref ins hard)
     (princ " : hard")
     ))


@@ -379,16 +377,16 @@ Can't be blank, or it might be used by regular variable insertion.")
     (where :initform 'begin
           :initarg :where
           :documentation
     (where :initform 'begin
           :initarg :where
           :documentation

-          "This should be 'begin or 'end, indicating where to insert a CR.
-When set to 'begin, it will insert a CR if we are not at 'bol'.
-When set to 'end it will insert a CR if we are not at 'eol'.")
+          "This should be `begin' or `end', indicating where to insert a CR.
+When `begin', insert a CR if not at 'bol'.
+When `end', insert a CR if not at 'eol'.")

     ;; @TODO - Add slot and control for the number of blank
     ;;         lines before and after point.
    )
    "Insert a newline before and after a template, and possibly do indenting.
 Specify the :blank argument to enable this inserter.")
 
     ;; @TODO - Add slot and control for the number of blank
     ;;         lines before and after point.
    )
    "Insert a newline before and after a template, and possibly do indenting.
 Specify the :blank argument to enable this inserter.")
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-blank)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-blank)

                                  dictionary)
   "Make sure there is no text before or after point."
   (let ((i (srecode-dictionary-lookup-name dictionary "INDENT"))
                                  dictionary)
   "Make sure there is no text before or after point."
   (let ((i (srecode-dictionary-lookup-name dictionary "INDENT"))


@@ -396,7 +394,7 @@ Specify the :blank argument to enable this inserter.")
        (pm (point-marker)))
     (when (and inbuff
               ;; Don't do this if we are not the active template.
        (pm (point-marker)))
     (when (and inbuff
               ;; Don't do this if we are not the active template.

-              (= (length (oref srecode-template active)) 1))
+              (= (length (oref-default 'srecode-template active)) 1))

 
       (when (and (eq i t) inbuff (not (eq (oref sti where) 'begin)))
        (indent-according-to-mode)
 
       (when (and (eq i t) inbuff (not (eq (oref sti where) 'begin)))
        (indent-according-to-mode)


@@ -425,8 +423,8 @@ Specify the :blank argument to enable this inserter.")
    )
   "Allow comments within template coding.  This inserts nothing.")
 
    )
   "Allow comments within template coding.  This inserts nothing.")
 

-(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-comment)
-                                                 escape-start escape-end)
+(cl-defmethod srecode-inserter-prin-example ((_ins (subclass srecode-template-inserter-comment))
+                                             escape-start escape-end)

   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (princ "   ")
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (princ "   ")


@@ -436,8 +434,8 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (terpri)
   )
 
   (terpri)
   )
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-comment)
-                                 dictionary)
+(cl-defmethod srecode-insert-method ((_sti srecode-template-inserter-comment)
+                                     _dictionary)

   "Don't insert anything for comment macros in STI."
   nil)
 
   "Don't insert anything for comment macros in STI."
   nil)
 


@@ -453,7 +451,7 @@ If there is no entry, insert nothing.")
 (defvar srecode-inserter-variable-current-dictionary nil
   "The active dictionary when calling a variable filter.")
 
 (defvar srecode-inserter-variable-current-dictionary nil
   "The active dictionary when calling a variable filter.")
 

-(defmethod srecode-insert-variable-secondname-handler
+(cl-defmethod srecode-insert-variable-secondname-handler

   ((sti srecode-template-inserter-variable) dictionary value secondname)
   "For VALUE handle SECONDNAME behaviors for this variable inserter.
 Return the result as a string.
   ((sti srecode-template-inserter-variable) dictionary value secondname)
   "For VALUE handle SECONDNAME behaviors for this variable inserter.
 Return the result as a string.


@@ -471,7 +469,7 @@ If SECONDNAME is nil, return VALUE."
           (object-print sti) secondname)))
     value))
 
           (object-print sti) secondname)))
     value))
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-variable)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-variable)

                                  dictionary)
   "Insert the STI inserter."
   ;; Convert the name into a name/fcn pair
                                  dictionary)
   "Insert the STI inserter."
   ;; Convert the name into a name/fcn pair


@@ -491,7 +489,7 @@ If SECONDNAME is nil, return VALUE."
        (setq val (srecode-insert-variable-secondname-handler
                   sti dictionary val fcnpart)))
        ;; Compound data value
        (setq val (srecode-insert-variable-secondname-handler
                   sti dictionary val fcnpart)))
        ;; Compound data value

-       ((srecode-dictionary-compound-value-child-p val)
+       ((cl-typep val 'srecode-dictionary-compound-value)

        ;; Force FCN to be a symbol
        (when fcnpart (setq fcnpart (read fcnpart)))
        ;; Convert compound value to a string with the fcn.
        ;; Force FCN to be a symbol
        (when fcnpart (setq fcnpart (read fcnpart)))
        ;; Convert compound value to a string with the fcn.


@@ -502,7 +500,7 @@ If SECONDNAME is nil, return VALUE."
          (setq do-princ nil)))
 
        ;; Dictionaries... not allowed in this style
          (setq do-princ nil)))
 
        ;; Dictionaries... not allowed in this style

-       ((srecode-dictionary-child-p val)
+       ((cl-typep val 'srecode-dictionary)

        (srecode-insert-report-error
         dictionary
         "Macro %s cannot insert a dictionary - use section macros instead"
        (srecode-insert-report-error
         dictionary
         "Macro %s cannot insert a dictionary - use section macros instead"


@@ -541,7 +539,7 @@ If there is no entry, prompt the user for the value to use.
 The prompt text used is derived from the previous PROMPT command in the
 template file.")
 
 The prompt text used is derived from the previous PROMPT command in the
 template file.")
 

-(defmethod srecode-inserter-apply-state
+(cl-defmethod srecode-inserter-apply-state

   ((ins srecode-template-inserter-ask) STATE)
   "For the template inserter INS, apply information from STATE.
 Loop over the prompts to see if we have a match."
   ((ins srecode-template-inserter-ask) STATE)
   "For the template inserter INS, apply information from STATE.
 Loop over the prompts to see if we have a match."


@@ -561,14 +559,14 @@ Loop over the prompts to see if we have a match."
       (setq prompts (cdr prompts)))
     ))
 
       (setq prompts (cdr prompts)))
     ))
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-ask)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-ask)

                                  dictionary)
   "Insert the STI inserter."
   (let ((val (srecode-dictionary-lookup-name
              dictionary (oref sti :object-name))))
     (if val
        ;; Does some extra work.  Oh well.
                                  dictionary)
   "Insert the STI inserter."
   (let ((val (srecode-dictionary-lookup-name
              dictionary (oref sti :object-name))))
     (if val
        ;; Does some extra work.  Oh well.

-       (call-next-method)
+       (cl-call-next-method)

 
       ;; How is our -ask value determined?
       (if srecode-insert-with-fields-in-progress
 
       ;; How is our -ask value determined?
       (if srecode-insert-with-fields-in-progress


@@ -585,9 +583,9 @@ Loop over the prompts to see if we have a match."
 
       ;; Now that this value is safely stowed in the dictionary,
       ;; we can do what regular inserters do.
 
       ;; Now that this value is safely stowed in the dictionary,
       ;; we can do what regular inserters do.

-      (call-next-method))))
+      (cl-call-next-method))))

 
 

-(defmethod srecode-insert-ask-default ((sti srecode-template-inserter-ask)
+(cl-defmethod srecode-insert-ask-default ((sti srecode-template-inserter-ask)

                                       dictionary)
   "Derive the default value for an askable inserter STI.
 DICTIONARY is used to derive some values."
                                       dictionary)
   "Derive the default value for an askable inserter STI.
 DICTIONARY is used to derive some values."


@@ -612,7 +610,7 @@ DICTIONARY is used to derive some values."
        dictionary
        "Unknown default for prompt: %S" defaultfcn)))))
 
        dictionary
        "Unknown default for prompt: %S" defaultfcn)))))
 

-(defmethod srecode-insert-method-ask ((sti srecode-template-inserter-ask)
+(cl-defmethod srecode-insert-method-ask ((sti srecode-template-inserter-ask)

                                      dictionary)
   "Do the \"asking\" for the template inserter STI.
 Use DICTIONARY to resolve values."
                                      dictionary)
   "Do the \"asking\" for the template inserter STI.
 Use DICTIONARY to resolve values."


@@ -646,7 +644,7 @@ Use DICTIONARY to resolve values."
     val)
   )
 
     val)
   )
 

-(defmethod srecode-insert-method-field ((sti srecode-template-inserter-ask)
+(cl-defmethod srecode-insert-method-field ((sti srecode-template-inserter-ask)

                                        dictionary)
   "Create an editable field for the template inserter STI.
 Use DICTIONARY to resolve values."
                                        dictionary)
   "Create an editable field for the template inserter STI.
 Use DICTIONARY to resolve values."


@@ -661,9 +659,9 @@ Use DICTIONARY to resolve values."
     ;; across multiple locations.
     compound-value))
 
     ;; across multiple locations.
     compound-value))
 

-(defmethod srecode-dump ((ins srecode-template-inserter-ask) indent)
+(cl-defmethod srecode-dump ((ins srecode-template-inserter-ask) _indent)

   "Dump the state of the SRecode template inserter INS."
   "Dump the state of the SRecode template inserter INS."

-  (call-next-method)
+  (cl-call-next-method)

   (princ " : \"")
   (princ (oref ins prompt))
   (princ "\"")
   (princ " : \"")
   (princ (oref ins prompt))
   (princ "\"")


@@ -681,8 +679,8 @@ Thus a specification of `10:left' will insert the value of A
 to 10 characters, with spaces added to the left.  Use `right' for adding
 spaces to the right.")
 
 to 10 characters, with spaces added to the left.  Use `right' for adding
 spaces to the right.")
 

-(defmethod srecode-insert-variable-secondname-handler
-  ((sti srecode-template-inserter-width) dictionary value width)
+(cl-defmethod srecode-insert-variable-secondname-handler
+  ((_sti srecode-template-inserter-width) dictionary value width)

   "For VALUE handle WIDTH behaviors for this variable inserter.
 Return the result as a string.
 By default, treat as a function name."
   "For VALUE handle WIDTH behaviors for this variable inserter.
 Return the result as a string.
 By default, treat as a function name."


@@ -714,8 +712,8 @@ By default, treat as a function name."
            (concat padchars value)
          (concat value padchars))))))
 
            (concat padchars value)
          (concat value padchars))))))
 

-(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-width)
-                                                 escape-start escape-end)
+(cl-defmethod srecode-inserter-prin-example ((_ins (subclass srecode-template-inserter-width))
+                                             escape-start escape-end)

   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (princ "   ")
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (princ "   ")


@@ -750,8 +748,8 @@ The cursor is placed at the ^ macro after insertion.
 Some inserter macros, such as `srecode-template-inserter-include-wrap'
 will place text at the ^ macro from the included macro.")
 
 Some inserter macros, such as `srecode-template-inserter-include-wrap'
 will place text at the ^ macro from the included macro.")
 

-(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-point)
-                                                 escape-start escape-end)
+(cl-defmethod srecode-inserter-prin-example ((_ins (subclass srecode-template-inserter-point))
+                                             escape-start escape-end)

   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (princ "   ")
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (princ "   ")


@@ -761,10 +759,10 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (terpri)
   )
 
   (terpri)
   )
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-point)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-point)

                                  dictionary)
   "Insert the STI inserter.
                                  dictionary)
   "Insert the STI inserter.

-Save point in the class allocated 'point' slot.
+Save point in the class allocated `point' slot.

 If `srecode-template-inserter-point-override' non-nil then this
 generalized marker will do something else.  See
 `srecode-template-inserter-include-wrap' as an example."
 If `srecode-template-inserter-point-override' non-nil then this
 generalized marker will do something else.  See
 `srecode-template-inserter-include-wrap' as an example."


@@ -773,7 +771,7 @@ generalized marker will do something else.  See
   ;; valid. Compare this to the actual template nesting depth and
   ;; maybe use the override function which is stored in the cdr.
   (if (and srecode-template-inserter-point-override
   ;; valid. Compare this to the actual template nesting depth and
   ;; maybe use the override function which is stored in the cdr.
   (if (and srecode-template-inserter-point-override

-          (<= (length (oref srecode-template active))
+          (<= (length (oref-default 'srecode-template active))

               (car srecode-template-inserter-point-override)))
       ;; Disable the old override while we do this.
       (let ((over (cdr srecode-template-inserter-point-override))
               (car srecode-template-inserter-point-override)))
       ;; Disable the old override while we do this.
       (let ((over (cdr srecode-template-inserter-point-override))


@@ -787,11 +785,11 @@ generalized marker will do something else.  See
   "Wrap a section of a template under the control of a macro."
   :abstract t)
 
   "Wrap a section of a template under the control of a macro."
   :abstract t)
 

-(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-subtemplate)
-                                                 escape-start escape-end)
+(cl-defmethod srecode-inserter-prin-example ((_ins (subclass srecode-template-inserter-subtemplate))
+                                             escape-start escape-end)

   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."

-  (call-next-method)
+  (cl-call-next-method)

   (princ "     Template Text to control")
   (terpri)
   (princ "   ")
   (princ "     Template Text to control")
   (terpri)
   (princ "   ")


@@ -801,11 +799,11 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (terpri)
   )
 
   (terpri)
   )
 

-(defmethod srecode-insert-subtemplate ((sti srecode-template-inserter-subtemplate)
+(cl-defmethod srecode-insert-subtemplate ((sti srecode-template-inserter-subtemplate)

                                       dict slot)
   "Insert a subtemplate for the inserter STI with dictionary DICT."
   ;; Make sure that only dictionaries are used.
                                       dict slot)
   "Insert a subtemplate for the inserter STI with dictionary DICT."
   ;; Make sure that only dictionaries are used.

-  (unless (srecode-dictionary-child-p dict)
+  (unless (cl-typep dict 'srecode-dictionary)

     (srecode-insert-report-error
      dict
      "Only section dictionaries allowed for `%s'"
     (srecode-insert-report-error
      dict
      "Only section dictionaries allowed for `%s'"


@@ -814,7 +812,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   ;; Output the code from the sub-template.
   (srecode-insert-method (slot-value sti slot) dict))
 
   ;; Output the code from the sub-template.
   (srecode-insert-method (slot-value sti slot) dict))
 

-(defmethod srecode-insert-method-helper ((sti srecode-template-inserter-subtemplate)
+(cl-defmethod srecode-insert-method-helper ((sti srecode-template-inserter-subtemplate)

                                         dictionary slot)
   "Do the work for inserting the STI inserter.
 Loops over the embedded CODE which was saved here during compilation.
                                         dictionary slot)
   "Do the work for inserting the STI inserter.
 Loops over the embedded CODE which was saved here during compilation.


@@ -837,7 +835,7 @@ The template to insert is stored in SLOT."
       (srecode-insert-subtemplate sti (car dicts) slot)
       (setq dicts (cdr dicts)))))
 
       (srecode-insert-subtemplate sti (car dicts) slot)
       (setq dicts (cdr dicts)))))
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-subtemplate)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-subtemplate)

                                  dictionary)
   "Insert the STI inserter.
 Calls back to `srecode-insert-method-helper' for this class."
                                  dictionary)
   "Insert the STI inserter.
 Calls back to `srecode-insert-method-helper' for this class."


@@ -858,7 +856,7 @@ The dictionary saved at the named dictionary entry will be
 applied to the text between the section start and the
 `srecode-template-inserter-section-end' macro.")
 
 applied to the text between the section start and the
 `srecode-template-inserter-section-end' macro.")
 

-(defmethod srecode-parse-input ((ins srecode-template-inserter-section-start)
+(cl-defmethod srecode-parse-input ((ins srecode-template-inserter-section-start)

                                tag input STATE)
   "For the section inserter INS, parse INPUT.
 Shorten input until the END token is found.
                                tag input STATE)
   "For the section inserter INS, parse INPUT.
 Shorten input until the END token is found.


@@ -872,9 +870,9 @@ Return the remains of INPUT."
                        :code (cdr out)))
     (car out)))
 
                        :code (cdr out)))
     (car out)))
 

-(defmethod srecode-dump ((ins srecode-template-inserter-section-start) indent)
+(cl-defmethod srecode-dump ((ins srecode-template-inserter-section-start) indent)

   "Dump the state of the SRecode template inserter INS."
   "Dump the state of the SRecode template inserter INS."

-  (call-next-method)
+  (cl-call-next-method)

   (princ "\n")
   (srecode-dump-code-list (oref (oref ins template) code)
                          (concat indent "    "))
   (princ "\n")
   (srecode-dump-code-list (oref (oref ins template) code)
                          (concat indent "    "))


@@ -889,12 +887,12 @@ Return the remains of INPUT."
   "All template segments between the section-start and section-end
 are treated specially.")
 
   "All template segments between the section-start and section-end
 are treated specially.")
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-section-end)
-                                 dictionary)
+(cl-defmethod srecode-insert-method ((_sti srecode-template-inserter-section-end)
+                                 _dictionary)

   "Insert the STI inserter."
   )
 
   "Insert the STI inserter."
   )
 

-(defmethod srecode-match-end ((ins srecode-template-inserter-section-end) name)
+(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)))
 
   "For the template inserter INS, do I end a section called NAME?"
   (string= name (oref ins :object-name)))


@@ -912,7 +910,7 @@ are treated specially.")
 The included template will have additional dictionary entries from the subdictionary
 stored specified by this macro.")
 
 The included template will have additional dictionary entries from the subdictionary
 stored specified by this macro.")
 

-(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-include)
+(cl-defmethod srecode-inserter-prin-example ((_ins (subclass srecode-template-inserter-include))

                                                  escape-start escape-end)
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
                                                  escape-start escape-end)
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."


@@ -923,7 +921,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (terpri)
   )
 
   (terpri)
   )
 

-(defmethod srecode-insert-include-lookup ((sti srecode-template-inserter-include)
+(cl-defmethod srecode-insert-include-lookup ((sti srecode-template-inserter-include)

                                          dictionary)
   "For the template inserter STI, lookup the template to include.
 Finds the template with this macro function part and stores it in
                                          dictionary)
   "For the template inserter STI, lookup the template to include.
 Finds the template with this macro function part and stores it in


@@ -943,7 +941,7 @@ this template instance."
     ;; Calculate and store the discovered template
     (let ((tmpl (srecode-template-get-table (srecode-table)
                                            templatenamepart))
     ;; Calculate and store the discovered template
     (let ((tmpl (srecode-template-get-table (srecode-table)
                                            templatenamepart))

-         (active (oref srecode-template active))
+         (active (oref-default 'srecode-template active))

          ctxt)
       (when (not tmpl)
        ;; If it isn't just available, scan back through
          ctxt)
       (when (not tmpl)
        ;; If it isn't just available, scan back through


@@ -981,7 +979,7 @@ this template instance."
        "No template \"%s\" found for include macro `%s'"
        templatenamepart (oref sti :object-name)))))
 
        "No template \"%s\" found for include macro `%s'"
        templatenamepart (oref sti :object-name)))))
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-include)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-include)

                                  dictionary)
   "Insert the STI inserter.
 Finds the template with this macro function part, and inserts it
                                  dictionary)
   "Insert the STI inserter.
 Finds the template with this macro function part, and inserts it


@@ -1017,7 +1015,7 @@ stored specified by this macro.  If the included macro includes a ^ macro,
 then the text between this macro and the end macro will be inserted at
 the ^ macro.")
 
 then the text between this macro and the end macro will be inserted at
 the ^ macro.")
 

-(defmethod srecode-inserter-prin-example :STATIC ((ins srecode-template-inserter-include-wrap)
+(cl-defmethod srecode-inserter-prin-example ((_ins (subclass srecode-template-inserter-include-wrap))

                                                  escape-start escape-end)
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
                                                  escape-start escape-end)
   "Insert an example using inserter INS.
 Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."


@@ -1035,7 +1033,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (terpri)
   )
 
   (terpri)
   )
 

-(defmethod srecode-insert-method ((sti srecode-template-inserter-include-wrap)
+(cl-defmethod srecode-insert-method ((sti srecode-template-inserter-include-wrap)

                                  dictionary)
   "Insert the template STI.
 This will first insert the include part via inheritance, then
                                  dictionary)
   "Insert the template STI.
 This will first insert the include part via inheritance, then


@@ -1053,7 +1051,7 @@ template where a ^ inserter occurs."
         (lexical-let ((inserter1 sti))
           (cons
            ;; DEPTH
         (lexical-let ((inserter1 sti))
           (cons
            ;; DEPTH

-           (+ (length (oref srecode-template active)) 1)
+           (+ (length (oref-default 'srecode-template active)) 1)

            ;; FUNCTION
            (lambda (dict)
              (let ((srecode-template-inserter-point-override nil))
            ;; FUNCTION
            (lambda (dict)
              (let ((srecode-template-inserter-point-override nil))


@@ -1067,7 +1065,7 @@ template where a ^ inserter occurs."
                   inserter1 dict 'template))))))))
     ;; Do a regular insertion for an include, but with our override in
     ;; place.
                   inserter1 dict 'template))))))))
     ;; Do a regular insertion for an include, but with our override in
     ;; place.

-    (call-next-method)))
+    (cl-call-next-method)))

 
 (provide 'srecode/insert)
 
 
 (provide 'srecode/insert)