Merge changes from CEDET upstream.

* semantic.el (semantic-error-if-unparsed): New function.  Raise
  error if buffer was not parsed by Semantic (bug #12045).
  (navigate-menu, edit-menu, cedet-menu-map): Enable Semantic items
  only if buffer was parsed.  Also, replace ':active' with ':enable'
  where necessary.

* semantic/wisent/python.el
  (semantic-python-get-system-include-path): Use
  `python-shell-internal-send-string' if available to query Python
  for system paths.

* semantic/senator.el (senator-next-tag):
  (senator-previous-tag):
  (senator-go-to-up-reference): Use `semantic-error-if-unparsed'.

* semantic/complete.el (semantic-complete-jump-local):
  (semantic-complete-jump):
  (semantic-complete-jump-local-members):
  (semantic-complete-self-insert): Use `semantic-error-if-unparsed'.
  (semantic-complete-inline-project): Fix autoload cookie.

* semantic/analyze/complete.el
  (semantic-analyze-possible-completions): Check if buffer was
  parsed.  Only raise an error if function was called interactively,
  otherwise silently return nil.

* cedet.el (cedet-menu-map): Fix copy&paste typo in menu creation.

1 files changed, 9 insertions, 18 deletions

diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index a0ea488f0fe..89c0499b7da 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -48,24 +48,15 @@
 
 (defun semantic-python-get-system-include-path ()
   "Evaluate some Python code that determines the system include path."
-  (python-proc)
-  (if python-buffer
-      (with-current-buffer python-buffer
-	(set (make-local-variable 'python-preoutput-result) nil)
-	(python-send-string
-	 "import sys; print '_emacs_out ' + '\\0'.join(sys.path)")
-	(accept-process-output (python-proc) 2)
-	(if python-preoutput-result
-	    (split-string python-preoutput-result "[\0\n]" t)
-	  ;; Try a second, Python3k compatible shot
-	  (python-send-string
-	   "import sys; print('_emacs_out ' + '\\0'.join(sys.path))")
-	  (accept-process-output (python-proc) 2)
-	  (if python-preoutput-result
-	      (split-string python-preoutput-result "[\0\n]" t)
-	    (message "Timeout while querying Python for system include path.")
-	    nil)))
-    (message "Python seems to be unavailable on this system.")))
+  (delq nil
+	(mapcar
+	 (lambda (dir)
+	   (when (file-directory-p dir)
+	     dir))
+	 (split-string
+	  (python-shell-internal-send-string
+	   "import sys;print ('\\n'.join(sys.path))")
+	  "\n" t))))
 
 (defcustom-mode-local-semantic-dependency-system-include-path
   python-mode semantic-python-dependency-system-include-path