From aa8724aeadb56751cb464fd5ebbf5f2e631fd3fa Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 30 Aug 2009 21:16:39 +0000
Subject: cedet/cedet.el (cedet-packages): Bump srecode version.

cedet/data-debug.el: Require `ring' for use of ring-length.

cedet/semantic.el (semantic-repeat-parse-whole-stream): Check
semantic-working-type before updating progress reporter.

cedet/semantic/adebug.el: Fix file header.

cedet/semantic/analyze.el: eval-when-compile semantic/find, for
semantic-find-tags-by-name.  Declare semanticdb-strip-find-results and
semanticdb-find-tags-by-name.

cedet/semantic/chart.el: Require semantic/find, semantic/db-mode,
semantic/db-typecache, and semantic/scope.

cedet/semantic/complete.el: Declare
semantic-displayor-focus-abstract-child-p function (needed as the
semantic-displayor-focus-abstract class is defined only after used).
Move semantic-complete-inline-custom-type and
semantic-complete-inline-analyzer-displayor-class variable definitions
up, before they are used, to avoid compiler warning.
Require semantic/decorate, semantic/tag-file, eieio-opt, and
semantic/analyze/complete.

cedet/semantic/ctxt.el: Require semantic/find.  Don't
eval-when-compile semantic/db
(semantic-get-local-variables): Use Emacs' built-in progress reporter
instead of working-status-forms.

cedet/semantic/db-debug.el: Require data-debug, semantic/db-mode, and
semantic/format.

cedet/semantic/db-ebrowse.el: Require semantic/db-mode, semantic/find,
semantic/sort, data-debug
(semanticdb-create-database): Require semantic/dep for
semantic-add-system-include.
(semanticdb-table-ebrowse, semanticdb-project-database-ebrowse): Move
class definitions near top of file, before they are used, to avoid
compiler warnings.
(semanticdb-ebrowse-add-tree-to-table): Use split-string.
---
 lisp/cedet/semantic/ctxt.el | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'lisp/cedet/semantic/ctxt.el')

diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 270b9964031..40da8153aec 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -1,4 +1,4 @@
-;;; ctxt.el --- Context calculations for Semantic tools.
+;;; semantic/ctxt.el --- Context calculations for Semantic tools.
 
 ;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;; 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -31,7 +31,7 @@
 ;; the current context is calculated.
 ;;
 (require 'semantic)
-(eval-when-compile (require 'semantic/db))
+(require 'semantic/find)
 
 ;;; Code:
 (defvar semantic-command-separation-character
@@ -155,16 +155,15 @@ Return non-nil if there is no upper context."
 Local variables are returned in Semantic tag format.
 This can be overriden with `get-local-variables'."
   ;; The working status is to let the parser work properly
-  (working-status-forms
-   (semantic-parser-working-message "Local")
-   "done"
-   (save-excursion
-     (if point (goto-char point))
-     (let* ((semantic-working-type nil)
-	    ;; Disable parsing messages
-	    (working-status-dynamic-type nil)
-	    (case-fold-search semantic-case-fold))
-       (:override-with-args ())))))
+  (let ((semantic--progress-reporter
+	 (make-progress-reporter (semantic-parser-working-message "Local")
+				 0 100)))
+    (save-excursion
+      (if point (goto-char point))
+      (let* ((semantic-working-type nil)
+	     ;; Disable parsing messages
+	     (case-fold-search semantic-case-fold))
+	(:override-with-args ())))))
 
 (defun semantic-get-local-variables-default ()
   "Get local values from a specific context.
@@ -610,4 +609,4 @@ overriden."
 
 (provide 'semantic/ctxt)
 
-;;; semantic-ctxt.el ends here
+;;; semantic/ctxt.el ends here
-- 
cgit v1.2.1