Merge branch 'master' into cairo

3 files changed, 35 insertions, 38 deletions

diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index c93a6f72a9a..a8d6a5008bb 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -116,19 +116,19 @@ additional static argument data."))
 Plain text strings are not handled via this baseclass."
   :abstract t)
 
-(cl-defmethod srecode-parse-input ((ins srecode-template-inserter)
-                                tag input STATE)
+(cl-defmethod srecode-parse-input ((_ins srecode-template-inserter)
+                                   _tag input _STATE)
   "For the template inserter INS, parse INPUT.
 Shorten input only by the amount needed.
 Return the remains of INPUT.
 STATE is the current compilation state."
   input)
 
-(cl-defmethod srecode-match-end ((ins srecode-template-inserter) name)
+(cl-defmethod srecode-match-end ((_ins srecode-template-inserter) _name)
   "For the template inserter INS, do I end a section called NAME?"
   nil)
 
-(cl-defmethod srecode-inserter-apply-state ((ins srecode-template-inserter) STATE)
+(cl-defmethod srecode-inserter-apply-state ((_ins srecode-template-inserter) _STATE)
   "For the template inserter INS, apply information from STATE."
   nil)
 
@@ -415,7 +415,7 @@ If END-NAME is specified, and the input string"
                                  (match-end 0)))
                (namestart (match-end 0))
                (junk (string-match regexend what namestart))
-               end tail name key)
+               end tail name)
           ;; Add string to compiled output
           (when (> (length prefix) 0)
             (setq comp (cons prefix comp)))
@@ -453,8 +453,7 @@ If END-NAME is specified, and the input string"
                           (semantic-tag-name tag)))
                   )
             ;; Add string to compiled output
-            (setq name (substring what namestart end)
-                  key nil)
+            (setq name (substring what namestart end))
             ;; Trim WHAT back.
             (setq what (substring what tail))
             ;; Get the inserter
@@ -523,7 +522,7 @@ to the inserter constructor."
         (setq classes (append classes (eieio-class-children (car classes))))
         ;; Do we have a match?
         (when (and (not (class-abstract-p (car classes)))
-                   (equal (oref (car classes) key) key))
+                   (equal (oref-default (car classes) key) key))
           ;; Create the new class, and apply state.
           (setq new (apply (car classes) name props))
           (srecode-inserter-apply-state new STATE)
@@ -642,7 +641,7 @@ Argument INDENT specifies the indentation level for the list."
         (princ "\n"))))
   )
 
-(cl-defmethod srecode-dump ((ins srecode-template-inserter) indent)
+(cl-defmethod srecode-dump ((ins srecode-template-inserter) _indent)
   "Dump the state of the SRecode template inserter INS."
   (princ "INS: \"")
   (princ (eieio-object-name-string ins))
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 97d3310a2ae..27e730f9d6a 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -195,8 +195,8 @@ associated with a buffer or parent."
               initfrombuff t)))
 
       ;; Create the new dictionary object.
-      (let ((dict (srecode-dictionary
-                   major-mode
+      (let ((dict (make-instance
+                   'srecode-dictionary
                    :buffer   buffer
                    :parent   parent
                    :namehash (make-hash-table :test 'equal
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 0c13ee51e34..c2a70fe030f 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -35,7 +35,6 @@
 (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")
 
@@ -145,7 +144,7 @@ has set everything up already."
                )
       (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.
@@ -264,13 +263,12 @@ Optional argument TEMP is the template that is getting its arguments resolved."
   "Push the srecoder template ST onto the active stack."
   (oset st active (cons st (oref st active))))
 
-(cl-defmethod srecode-pop ((st (subclass 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))))
 
-(cl-defmethod srecode-peek ((st (subclass 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)))
 
 (cl-defmethod srecode-insert-method ((st srecode-template) dictionary)
@@ -363,7 +361,7 @@ occur in your template.")
             ((stringp i)
              (princ i))))))
 
-(cl-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."
   (cl-call-next-method)
   (when (oref ins hard)
@@ -425,8 +423,8 @@ Specify the :blank argument to enable this inserter.")
    )
   "Allow comments within template coding.  This inserts nothing.")
 
-(cl-defmethod srecode-inserter-prin-example ((ins (subclass 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 "   ")
@@ -436,8 +434,8 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   (terpri)
   )
 
-(cl-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)
 
@@ -491,7 +489,7 @@ If SECONDNAME is nil, return 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.
@@ -502,7 +500,7 @@ If SECONDNAME is nil, return VALUE."
           (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"
@@ -661,7 +659,7 @@ Use DICTIONARY to resolve values."
     ;; across multiple locations.
     compound-value))
 
-(cl-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."
   (cl-call-next-method)
   (princ " : \"")
@@ -682,7 +680,7 @@ to 10 characters, with spaces added to the left.  Use `right' for adding
 spaces to the right.")
 
 (cl-defmethod srecode-insert-variable-secondname-handler
-  ((sti srecode-template-inserter-width) dictionary value width)
+  ((_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."
@@ -714,8 +712,8 @@ By default, treat as a function name."
             (concat padchars value)
           (concat value padchars))))))
 
-(cl-defmethod srecode-inserter-prin-example ((ins (subclass 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 "   ")
@@ -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.")
 
-(cl-defmethod srecode-inserter-prin-example ((ins (subclass 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 "   ")
@@ -787,8 +785,8 @@ generalized marker will do something else.  See
   "Wrap a section of a template under the control of a macro."
   :abstract t)
 
-(cl-defmethod srecode-inserter-prin-example ((ins (subclass 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."
   (cl-call-next-method)
@@ -805,7 +803,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
                                        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'"
@@ -889,8 +887,8 @@ Return the remains of INPUT."
   "All template segments between the section-start and section-end
 are treated specially.")
 
-(cl-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."
   )
 
@@ -912,7 +910,7 @@ are treated specially.")
 The included template will have additional dictionary entries from the subdictionary
 stored specified by this macro.")
 
-(cl-defmethod srecode-inserter-prin-example ((ins (subclass 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."
@@ -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.")
 
-(cl-defmethod srecode-inserter-prin-example ((ins (subclass 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."