diff lisp/cedet/semantic/scope.el @ 105652:51bc239bdc37

* cedet/srecode/srt.el: * cedet/srecode/compile.el: * cedet/semantic/mru-bookmark.el: * cedet/semantic/debug.el: * cedet/semantic/complete.el: * cedet/semantic/analyze.el: Require CL when compiling. * cedet/semantic/scope.el (semantic-analyze-scoped-inherited-tag-map): Wrap calculation of tmpscope so that the regular scope will continue to work. * cedet/semantic/idle.el (semantic-idle-tag-highlight): Use semantic-idle-summary-highlight-face as the highlighting. * emacs-lisp/eieio-base.el (eieio-persistent-save): If buffer contains multibyte characters, choose first applicable coding system automatically. * cedet/ede/project-am.el (project-run-target): New method. (project-run-target): New method. * cedet/ede.el (ede-target): Add run target menu item. (ede-project, ede-minor-keymap): Add ede-run-target binding. (ede-run-target): New function. (ede-target::project-run-target): New method. * cedet/ede/proj.el (project-run-target): New method. * cedet/ede/proj-shared.el (ede-gcc-libtool-shared-compiler) (ede-g++-libtool-shared-compiler): Remove SHELL. Remove COMMANDS. Add :rules. (ede-proj-target-makefile-shared-object): Only libtool compilers now available. Add linkers for libtool. (ede-cc-linker-libtool, ede-g++-linker-libtool): New. (ede-proj-makefile-target-name): Always use .la extension. * cedet/ede/proj-prog.el (project-run-target): New method. * cedet/ede/proj-obj.el (ede-cc-linker): Rename from ede-gcc-linker. (ede-g++-linker): Change Change link lines. * cedet/ede/pmake.el (ede-pmake-insert-variable-shared): When searching for old variables, go to the end of the buffer and search backward from there. (ede-proj-makefile-automake-insert-subdirs) (ede-proj-makefile-automake-insert-extradist): New methods. (ede-proj-makefile-create): Use them. * cedet/ede/pconf.el (ede-proj-configure-test-required-file): Force FILE to expand to the current target. Use file-exists-p to check that it exists. * cedet/ede/linux.el (ede-linux-version): Don't call "head". (ede-linux-load): Wrap dir in file-name-as-directory. Set :version slot. * cedet/ede/files.el (ede-get-locator-object): When enabling locate, do so on "top". * cedet/ede/emacs.el (ede-emacs-file-existing): Wrap "dir" in file-name-as-directory during compare. (ede-emacs-version): Return Emacs/XEmacs differentiator. Get version number from different places. Don't call egrep. (ede-emacs-load): Set :version slot. Call file-name-as-directory to set the directory. * cedet/ede/shell.el: New file. * cedet/inversion.el (inversion-decoders): Allow for stray . in alpha/beta variants.

--- a/lisp/cedet/semantic/scope.el	Sat Oct 17 03:59:45 2009 +0000
+++ b/lisp/cedet/semantic/scope.el	Sat Oct 17 04:18:31 2009 +0000
@@ -602,28 +602,29 @@
       ;;         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)
+	(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)
+	  ;; 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))
-	  ))
+	    (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.