conflict resolve

1 files changed, 3 insertions, 0 deletions

diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index cbe602f3299..1dd9ba4cf47 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -363,6 +363,9 @@ Return non-nil if the map changed."
           (let ((semantic-init-hook nil))
             (semantic-new-buffer-fcn))
           )
+        ;; Force semantic to be enabled in this buffer.
+        (unless (semantic-active-p)
+          (semantic-new-buffer-fcn))
 
         (semantic-fetch-tags)
         (let* ((mode-tag