3 files changed, 17 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f978958cd5..132e4f117ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2009-09-21  Chong Yidong  <cyd@stupidchicken.com>
 
+        * cedet/semantic.el (semantic-parser-working-message): Use a less
+        technical parsing message.
+        (semantic-mode): Require semantic/db-ebrowse if we need to.
+
+        * cedet/semantic/util-modes.el (semantic-highlight-func-mode): Doc
+        fix.
+
+2009-09-21  Chong Yidong  <cyd@stupidchicken.com>
+
         * cedet/semantic/db.el (semanticdb--inhibit-make-directory): New
         var.
         (semanticdb-save-all-db): Use it.
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 17c31a65c7f..1ab342f7676 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -37,6 +37,7 @@
   "Current version of Semantic.")
 
 (declare-function inversion-test "inversion")
+(declare-function semanticdb-load-ebrowse-caches "semantic/db-ebrowse")
 
 (defun semantic-require-version (major minor &optional beta)
   "Non-nil if this version of semantic does not satisfy a specific version.
@@ -525,9 +526,10 @@ Bufferse larger than this will display the working progress bar.")
   "Return the message string displayed while parsing.
 If optional argument ARG is non-nil it is appended to the message
 string."
-  (if semantic-parser-name
-      (format "%s/%s..." semantic-parser-name (or arg ""))
-    (format "%s" (or arg ""))))
+  (concat "Parsing"
+          (if arg (format " %s" arg))
+          (if semantic-parser-name (format " (%s)" semantic-parser-name))
+          "..."))
 
 ;;; Application Parser Entry Points
 ;;
@@ -878,6 +880,7 @@ Semantic mode."
           (when (and (boundp 'semanticdb-default-system-save-directory)
                      (stringp semanticdb-default-system-save-directory)
                      (file-exists-p semanticdb-default-system-save-directory))
+            (require 'semantic/db-ebrowse)
             (semanticdb-load-ebrowse-caches)))
         (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
         ;; Add mode-local hooks
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index ef7ec6cc1a9..4df7e68d338 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -1165,10 +1165,10 @@ current tag declaration."
   "Minor mode to highlight the first line of the current tag.
 Enables/disables making the header line of functions sticky.
 A function (or other tag class specified by
-`semantic-stickfunc-sticky-classes') is highlighted, meaning the
+`semantic-stickyfunc-sticky-classes') is highlighted, meaning the
 first line which describes the rest of the construct.
 
-See `semantic-stickfunc-mode' for putting a function in the
+See `semantic-stickyfunc-mode' for putting a function in the
 header line.  This mode recycles the stickyfunc configuration
 classes list.