* cedet/semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode)

(semantic-mru-bookmark-mode): Doc fixes.

* cedet/semantic/db.el (semanticdb-cache-get): Use error instead
of assert.

3 files changed, 17 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a61b92b986c..d4c117e43b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cedet/semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode)
+        (semantic-mru-bookmark-mode): Doc fixes.
+
+        * cedet/semantic/db.el (semanticdb-cache-get): Use error instead
+        of assert.
+
 2009-12-13  Glenn Morris  <rgm@gnu.org>
 
         * mail/emacsbug.el (message-sort-headers): Define for compiler.
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index b388a7d4647..796250ce0be 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -450,7 +450,8 @@ See the file semantic-scope.el for an example."
   "Get a cache object on TABLE of class DESIRED-CLASS.
 This method will create one if none exists with no init arguments
 other than :table."
-  (assert (child-of-class-p desired-class 'semanticdb-abstract-cache))
+  (unless (child-of-class-p desired-class 'semanticdb-abstract-cache)
+    (error "Invalid SemanticDB cache"))
   (let ((cache (oref table cache))
         (obj nil))
     (while (and (not obj) cache)
@@ -500,7 +501,8 @@ See the file semantic-scope.el for an example."
   "Get a cache object on DB of class DESIRED-CLASS.
 This method will create one if none exists with no init arguments
 other than :table."
-  (assert (child-of-class-p desired-class 'semanticdb-abstract-db-cache))
+  (unless (child-of-class-p desired-class 'semanticdb-abstract-cache)
+    (error "Invalid SemanticDB cache"))
   (let ((cache (oref db cache))
         (obj nil))
     (while (and (not obj) cache)
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index ca1bf3eea7e..c2b55b6b385 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -240,9 +240,9 @@ This function pushes tags onto the tag ring."
 ;; Tracking minor mode.
 
 (defcustom global-semantic-mru-bookmark-mode nil
-  "*If non-nil enable global use of variable `semantic-mru-bookmark-mode'.
-When this mode is enabled, changes made to a buffer are highlighted
-until the buffer is reparsed."
+  "If non-nil, enable `semantic-mru-bookmark-mode' globally.
+When this mode is enabled, Emacs keeps track of which tags have
+been edited, and you can re-visit them with \\[semantic-mrub-switch-tags]."
   :group 'semantic
   :group 'semantic-modes
   :type 'boolean
@@ -306,8 +306,8 @@ minor mode is enabled."
 
 (defun semantic-mru-bookmark-mode (&optional arg)
   "Minor mode for tracking tag-based bookmarks automatically.
-Tag based bookmarks a tracked based on editing and viewing habits
-and can then be navigated via the MRU bookmark keymap.
+When this mode is enabled, Emacs keeps track of which tags have
+been edited, and you can re-visit them with \\[semantic-mrub-switch-tags].
 
 \\{semantic-mru-bookmark-mode-map}