6 files changed, 28 insertions, 23 deletions
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 98c0665f842..a4d5664f226 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -64,6 +64,7 @@
 ;;       constant.  These need to be returned as there would be no
 ;;       other possible completions.
 
+(eval-when-compile (require 'cl))
 (require 'semantic)
 (require 'semantic/format)
 (require 'semantic/ctxt)
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 6744e2cd336..154defb417a 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -107,6 +107,7 @@
 ;; `semantic-complete-inline-tag-engine' will complete text in
 ;; a buffer.
 
+(eval-when-compile (require 'cl))
 (require 'semantic)
 (require 'eieio-opt)
 (require 'semantic/analyze)
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 6d88e9962a8..ac8b4b1314e 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -36,6 +36,7 @@
 ;; Each parser must implement the interface and override any methods as needed.
 ;;
 
+(eval-when-compile (require 'cl))
 (require 'semantic)
 (require 'eieio)
 (eval-when-compile (require 'semantic/find))
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 83ac3b27e7d..45f804b62a7 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -905,7 +905,7 @@ Call `semantic-symref-hits-in-region' to identify local references."
 	   target (lambda (start end prefix)
 		    (when (/= start (car Hbounds))
 		      (pulse-momentary-highlight-region
-		       start end))
+		       start end semantic-idle-summary-highlight-face))
 		    (semantic-throw-on-input 'symref-highlight)
 		    )
 	   (semantic-tag-start tag)
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index d57aa194b98..da508a67553 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -45,6 +45,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'semantic)
 (require 'eieio-base)
 (require 'ring)
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 99d410a6b3e..b7833e30a5f 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -602,28 +602,29 @@ whose tags can be searched when needed, OR it may be a scope object."
       ;;         for recycling later?  Should this become a helpful
       ;;         extra routine?
       (when (and parents (semantic-tag-with-position-p type))
-	;; If TYPE has a position, go there and get the scope.
-	(semantic-go-to-tag type)
-
-	;; We need to make a mini scope, and only include the misc bits
-	;; that will help in finding the parent.  We don't really need
-	;; to do any of the stuff related to variables and what-not.
-	(setq tmpscope (semantic-scope-cache "mini"))
-	(let* (;; Step 1:
-	       (scopetypes (semantic-analyze-scoped-types (point)))
-	       (parents (semantic-analyze-scope-nested-tags (point) scopetypes))
-	       ;;(parentinherited (semantic-analyze-scope-lineage-tags parents scopetypes))
-	       (lscope nil)
-	       )
-	  (oset tmpscope scopetypes scopetypes)
-	  (oset tmpscope parents parents)
-	  ;;(oset tmpscope parentinheritance parentinherited)
-
-	  (when (or scopetypes parents)
-	    (setq lscope (semantic-analyze-scoped-tags scopetypes tmpscope))
-	    (oset tmpscope scope lscope))
-	  (oset tmpscope fullscope (append scopetypes lscope parents))
-	  ))
+	(save-excursion
+	  ;; If TYPE has a position, go there and get the scope.
+	  (semantic-go-to-tag type)
+
+	  ;; We need to make a mini scope, and only include the misc bits
+	  ;; that will help in finding the parent.  We don't really need
+	  ;; to do any of the stuff related to variables and what-not.
+	  (setq tmpscope (semantic-scope-cache "mini"))
+	  (let* ( ;; Step 1:
+		 (scopetypes (semantic-analyze-scoped-types (point)))
+		 (parents (semantic-analyze-scope-nested-tags (point) scopetypes))
+		 ;;(parentinherited (semantic-analyze-scope-lineage-tags parents scopetypes))
+		 (lscope nil)
+		 )
+	    (oset tmpscope scopetypes scopetypes)
+	    (oset tmpscope parents parents)
+	    ;;(oset tmpscope parentinheritance parentinherited)
+
+	    (when (or scopetypes parents)
+	      (setq lscope (semantic-analyze-scoped-tags scopetypes tmpscope))
+	      (oset tmpscope scope lscope))
+	    (oset tmpscope fullscope (append scopetypes lscope parents))
+	    )))
       ;; END creating tmpscope
 
       ;; Look up each parent one at a time.