4 files changed, 2 insertions, 26 deletions
diff --git a/lisp/cedet/srecode/expandproto.el b/lisp/cedet/srecode/expandproto.el
index eb09ed260bd..a0c8ec62816 100644
--- a/lisp/cedet/srecode/expandproto.el
+++ b/lisp/cedet/srecode/expandproto.el
@@ -26,6 +26,7 @@
 (require 'ring)
 (require 'semantic)
 (require 'semantic/analyze)
+(require 'semantic/senator)
 (require 'srecode/insert)
 (require 'srecode/dictionary)
 
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 73a722b518d..d085fbac34f 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -30,7 +30,6 @@
 (require 'srecode/insert)
 (require 'srecode/find)
 (require 'srecode/map)
-;; (require 'senator)
 (require 'semantic/decorate)
 (require 'semantic/wisent)
 
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 178ec44a8de..22969db2323 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -37,8 +37,8 @@
 (require 'srecode/dictionary)
 (require 'semantic/find)
 (require 'semantic/format)
+(require 'semantic/senator)
 (require 'ring)
-;;(require 'senator)
 
 
 ;;; The SEMANTIC TAG inserter
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 004e4a86848..9034544482c 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -738,30 +738,6 @@ When optional BUFFER is provided, search that buffer."
 
       (nreverse ans))))
 
-
-;;; MMM-Mode support ??
-;;(condition-case nil
-;;    (require 'mmm-mode)
-;;  (error (message "SRecoder Template Mode: No multi-mode not support.")))
-;;
-;;(defun srecode-template-add-submode ()
-;;  "Add a submode to the current template file using mmm-mode.
-;;If mmm-mode isn't available, then do nothing."
-;;  (if (not (featurep 'mmm-mode))
-;;      nil  ;; Nothing to do.
-;;    ;; Else, set up mmm-mode in this buffer.
-;;    (let ((submode (semantic-find-tags-by-name "mode")))
-;;      (if (not submode)
-;;	  nil  ;; Nothing to do.
-;;	;; Well, we have a mode, lets try turning on mmm-mode.
-;;
-;;	;; (mmm-mode-on)
-;;
-;;
-;;
-;;	))))
-;;
-
 (provide 'srecode/srt-mode)
 
 ;; The autoloads in this file must go into the global loaddefs.el, not