* lisp/cedet/mode-local.el: Clean up name space

Mostly renaming functions by adding `mode-local--` to their name
and leaving an obsolete alias behind, just in case.

(define-child-mode): Make obsolete.
(mode-local--set-parent): Rename from set-mode-local-parent.
(mode-local--new-bindings): Rename from new-mode-local-bindings.
Use `obarray-make`.
(mode-local--activate-bindings): Rename from activate-mode-local-bindings.
(mode-local--deactivate-bindings): Rename from
deactivate-mode-local-bindings.
(make-obsolete-overload): Rename properties with a `mode-local--` prefix.
Adjust all users.
(mode-local--overload-obsoleted-by): Rename from overload-obsoleted-by.
(mode-local--overload-that-obsolete): Rename from overload-that-obsolete.
(mode-local--function-overload-p): Rename from function-overload-p.
(mode-local-read-function): Mark obsolete.
(mode-local--overload-docstring-extension): Rename from
overload-docstring-extension.
(mode-local--describe-overload): Rename from describe-mode-local-overload.

* lisp/cedet/semantic/fw.el (semantic-install-function-overrides):
Remove unused `mode` argument.

* lisp/cedet/semantic/grammar-wy.el (semantic-grammar-wy--install-parser):
* lisp/cedet/semantic/bovine/grammar.el (bovine-grammar-mode):
* lisp/cedet/semantic/texi.el (semantic-default-texi-setup):
* lisp/cedet/semantic/wisent/grammar.el (wisent-grammar-setupcode-builder)
(wisent-grammar-mode):
* lisp/cedet/semantic/html.el (semantic-default-html-setup):
Make the `semantic-` prefix explicit to ease grep search.
(html-helper-mode): Remove obsolete setting.

* lisp/cedet/semantic/wisent/javascript.el: Fix js-mode/javascript-mode
mixup so we don't need define-child-mode any more.
(semantic-get-local-variables, semantic-ctxt-current-symbol)
(semantic-tag-protection, semantic-analyze-scope-calculate-access):
Use `js-mode` rather than `javascript-mode` as the mode name since
that's the real mode's name.

* lisp/cedet/semantic/wisent/python.el (python-2-mode, python-3-mode):
Remove child declaration for non-existing modes.

* lisp/cedet/srecode/map.el (srecode-map-validate-file-for-mode): Simplify.

11 files changed, 35 insertions, 41 deletions

diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index b05082c60ef..862969dbc87 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -69,8 +69,10 @@ This function does not do any hidden buffer changes."
   )
 
 ;;; Code:
-(define-child-mode c++-mode c-mode
-  "`c++-mode' uses the same parser as `c-mode'.")
+(with-suppressed-warnings ((obsolete define-child-mode))
+  ;; FIXME: We should handle this some other way!
+  (define-child-mode c++-mode c-mode
+  "`c++-mode' uses the same parser as `c-mode'."))
 
 
 ;;; Include Paths
@@ -930,7 +932,7 @@ the regular parser."
             )                           ; save match data
 
           ;; Hack in mode-local
-          (activate-mode-local-bindings)
+          (mode-local--activate-bindings)
           ;; Setup C parser
           (semantic-default-c-setup)
           ;; CHEATER!  The following 3 lines are from
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index dd21f50325e..590256cc709 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -496,7 +496,8 @@ used to perform the override."
   (if (and (eq (semantic-tag-class tag) 'function)
            (semantic-tag-get-attribute tag :overloadable))
       ;; Calc the doc to use for the overloadable symbols.
-      (overload-docstring-extension (intern (semantic-tag-name tag)))
+      (mode-local--overload-docstring-extension
+       (intern (semantic-tag-name tag)))
     ""))
 
 (defun semantic-emacs-lisp-obsoleted-doc (tag)
@@ -944,8 +945,10 @@ See `semantic-format-tag-prototype' for Emacs Lisp for more details."
   "Add variables.
 ELisp variables can be pretty long, so track this one too.")
 
-(define-child-mode lisp-mode emacs-lisp-mode
-  "Make `lisp-mode' inherit mode local behavior from `emacs-lisp-mode'.")
+(with-suppressed-warnings ((obsolete define-child-mode))
+  ;; FIXME: We should handle this some other way!
+  (define-child-mode lisp-mode emacs-lisp-mode
+    "Make `lisp-mode' inherit mode local behavior from `emacs-lisp-mode'."))
 
 ;;;###autoload
 (defun semantic-default-elisp-setup ()
diff --git a/lisp/cedet/semantic/bovine/grammar.el b/lisp/cedet/semantic/bovine/grammar.el
index 7c25b79db86..4d7b008dbd3 100644
--- a/lisp/cedet/semantic/bovine/grammar.el
+++ b/lisp/cedet/semantic/bovine/grammar.el
@@ -438,8 +438,8 @@ Menu items are appended to the common grammar menu.")
   "Major mode for editing Bovine grammars."
   (semantic-grammar-setup-menu bovine-grammar-menu)
   (semantic-install-function-overrides
-   '((grammar-parsetable-builder . bovine-grammar-parsetable-builder)
-     (grammar-setupcode-builder  . bovine-grammar-setupcode-builder))))
+   '((semantic-grammar-parsetable-builder . bovine-grammar-parsetable-builder)
+     (semantic-grammar-setupcode-builder  . bovine-grammar-setupcode-builder))))
 
 (add-to-list 'auto-mode-alist '("\\.by\\'" . bovine-grammar-mode))
 
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index e07f0901849..202dec3df3b 100644
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -186,8 +186,8 @@ Mark OLDFNALIAS as obsolete, such that the byte compiler
 will throw a warning when it encounters this symbol."
   (defalias oldfnalias newfn)
   (make-obsolete oldfnalias newfn when)
-  (when (and (function-overload-p newfn)
-             (not (overload-obsoleted-by newfn))
+  (when (and (mode-local--function-overload-p newfn)
+             (not (mode-local--overload-obsoleted-by newfn))
              ;; Only throw this warning when byte compiling things.
              (boundp 'byte-compile-current-file)
              byte-compile-current-file
@@ -261,7 +261,7 @@ FUNCTION does not have arguments.  When FUNCTION is entered
 (semantic-alias-obsolete 'define-mode-overload-implementation
                          'define-mode-local-override "23.2")
 
-(defun semantic-install-function-overrides (overrides &optional transient mode)
+(defun semantic-install-function-overrides (overrides &optional transient)
   "Install the function OVERRIDES in the specified environment.
 OVERRIDES must be an alist ((OVERLOAD .  FUNCTION) ...) where OVERLOAD
 is a symbol identifying an overloadable entry, and FUNCTION is the
@@ -282,8 +282,7 @@ later installation should be done in MODE hook."
             (cons (intern (format "semantic-%s" name)) (cdr e)))))
     overrides)
    (list 'constant-flag (not transient)
-         'override-flag t)
-   mode))
+         'override-flag t)))
 
 ;;; User Interrupt handling
 ;;
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index 3b99469f558..1da57862d57 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -421,7 +421,7 @@
 (defun semantic-grammar-wy--install-parser ()
   "Setup the Semantic Parser."
   (semantic-install-function-overrides
-   '((parse-stream . wisent-parse-stream)))
+   '((semantic-parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table semantic-grammar-wy--parse-table
         semantic-debug-parser-source "grammar.wy"
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 3a8165c423a..f70fec2db74 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -247,13 +247,15 @@ tag with greater section value than LEVEL is found."
         semantic-stickyfunc-sticky-classes '(section)
         )
   (semantic-install-function-overrides
-   '((tag-components . semantic-html-components)
+   '((semantic-tag-components . semantic-html-components)
      )
    t)
   )
 
-(define-child-mode html-helper-mode html-mode
-  "`html-helper-mode' needs the same semantic support as `html-mode'.")
+;; `html-helper-mode' hasn't been updated since 2004, so it's not very
+;; relevant nowadays.
+;;(define-child-mode html-helper-mode html-mode
+;;  "`html-helper-mode' needs the same semantic support as `html-mode'.")
 
 (provide 'semantic/html)
 
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index d07dc806a48..a81b23ca750 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1071,7 +1071,7 @@ and variable state from the current buffer."
               (error nil))
 
             ;; Hack in mode-local
-            (activate-mode-local-bindings)
+            (mode-local--activate-bindings)
 
             ;; Call the major mode's setup function
             (let ((entry (assq major-mode semantic-new-buffer-setup-functions)))
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 3a0050b920c..73f0e734f32 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -63,9 +63,9 @@ Each tag returned is of the form:
 or
  (\"NAME\" def)
 
-It is an override of 'parse-region and must be installed by the
+It is an override of `semantic-parse-region' and must be installed by the
 function `semantic-install-function-overrides'."
-  (mapcar 'semantic-texi-expand-tag
+  (mapcar #'semantic-texi-expand-tag
           (semantic-texi-parse-headings)))
 
 (defun semantic-texi-parse-changes ()
@@ -451,8 +451,8 @@ that start with that symbol."
   "Set up a buffer for parsing of Texinfo files."
   ;; This will use our parser.
   (semantic-install-function-overrides
-   '((parse-region . semantic-texi-parse-region)
-     (parse-changes . semantic-texi-parse-changes)))
+   '((semantic-parse-region . semantic-texi-parse-region)
+     (semantic-parse-changes . semantic-texi-parse-changes)))
   (setq semantic-parser-name "TEXI"
         ;; Setup a dummy parser table to enable parsing!
         semantic--parse-table t
diff --git a/lisp/cedet/semantic/wisent/grammar.el b/lisp/cedet/semantic/wisent/grammar.el
index e6b389b60ba..1254f996809 100644
--- a/lisp/cedet/semantic/wisent/grammar.el
+++ b/lisp/cedet/semantic/wisent/grammar.el
@@ -297,7 +297,7 @@ Return the expanded expression."
   "Return the parser setup code."
   (format
    "(semantic-install-function-overrides\n\
-      '((parse-stream . wisent-parse-stream)))\n\
+      '((semantic-parse-stream . wisent-parse-stream)))\n\
     (setq semantic-parser-name \"LALR\"\n\
           semantic--parse-table %s\n\
           semantic-debug-parser-source %S\n\
@@ -326,8 +326,8 @@ Menu items are appended to the common grammar menu.")
   "Major mode for editing Wisent grammars."
   (semantic-grammar-setup-menu wisent-grammar-menu)
   (semantic-install-function-overrides
-   '((grammar-parsetable-builder . wisent-grammar-parsetable-builder)
-     (grammar-setupcode-builder  . wisent-grammar-setupcode-builder))))
+   '((semantic-grammar-parsetable-builder . wisent-grammar-parsetable-builder)
+     (semantic-grammar-setupcode-builder  . wisent-grammar-setupcode-builder))))
 
 (defvar-mode-local wisent-grammar-mode semantic-grammar-macros
   '(
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 7722c953609..4c93c0dc4fa 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -64,13 +64,13 @@ to this variable NAME."
 ;; the tags created by the javascript parser.
 ;; Local context
 (define-mode-local-override semantic-get-local-variables
-  javascript-mode ()
+  js-mode ()
   "Get local values from a specific context.
 This function overrides `get-local-variables'."
   ;; Does javascript have identifiable local variables?
   nil)
 
-(define-mode-local-override semantic-tag-protection javascript-mode (tag &optional parent)
+(define-mode-local-override semantic-tag-protection js-mode (tag &optional parent)
   "Return protection information about TAG with optional PARENT.
 This function returns on of the following symbols:
    nil         - No special protection.  Language dependent.
@@ -85,14 +85,14 @@ The default behavior (if not overridden with `tag-protection'
 is to return a symbol based on type modifiers."
   nil)
 
-(define-mode-local-override semantic-analyze-scope-calculate-access javascript-mode (type scope)
+(define-mode-local-override semantic-analyze-scope-calculate-access js-mode (type scope)
   "Calculate the access class for TYPE as defined by the current SCOPE.
 Access is related to the :parents in SCOPE.  If type is a member of SCOPE
 then access would be 'private.  If TYPE is inherited by a member of SCOPE,
 the access would be 'protected.  Otherwise, access is 'public."
   nil)
 
-(define-mode-local-override semantic-ctxt-current-symbol javascript-mode (&optional point)
+(define-mode-local-override semantic-ctxt-current-symbol js-mode (&optional point)
   "Return the current symbol the cursor is on at POINT in a list.
 This is a very simple implementation for Javascript symbols.  It
 will at maximum do one split, so that the first part is seen as
@@ -117,13 +117,6 @@ This is currently needed for the mozrepl omniscient database."
 
 ;;; Setup Function
 ;;
-;; Since javascript-mode is an alias for js-mode, let it inherit all
-;; the overrides.
-(define-child-mode js-mode javascript-mode)
-
-;; Since javascript-mode is an alias for js-mode, let it inherit all
-;; the overrides.
-(define-child-mode js-mode javascript-mode)
 
 ;; In semantic-imenu.el, not part of Emacs.
 (defvar semantic-imenu-summary-function)
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index f0e294efa62..540c59b9a7a 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -530,11 +530,6 @@ Shortens `code' tags, but passes through for others."
                                       (code . "Code")))
    )
 
-;; Make sure the newer python modes pull in the same python
-;; mode overrides.
-(define-child-mode python-2-mode python-mode "Python 2 mode")
-(define-child-mode python-3-mode python-mode "Python 3 mode")
-
 
 ;;; Utility functions
 ;;