From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 30 Sep 2010 01:41:13 +0000 (-0400)
Subject: Fix more CEDET require statements.
X-Git-Tag: emacs-pretest-23.2.90~91^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5d2e937703a5ccc2b3c731fe227915c0d8bc8315;p=emacs.git

Fix more CEDET require statements.

* semantic/bovine/el.el:
* semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode):
Fix require statements.
---

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 73761b4ee98..c0d96e795cc 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-30  Chong Yidong  <cyd@stupidchicken.com>
+
+	* semantic/bovine/el.el:
+	* semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode):
+	Fix require statements.
+
 2010-09-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* semantic/tag.el (semantic-tag-version): Bump to 2.0.
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 5b5a5660b7d..ed1f74c590f 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -958,7 +958,7 @@ ELisp variables can be pretty long, so track this one too.")
 (add-hook 'lisp-mode-hook 'semantic-default-elisp-setup)
 
 (eval-after-load "semanticdb"
-  '(require 'semanticdb-el)
+  '(require 'semantic/db-el)
   )
 
 (provide 'semantic/bovine/el)
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index 1982f81cbad..2a6ac8f9b10 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -246,7 +246,7 @@ been edited, and you can re-visit them with \\[semantic-mrub-switch-tags]."
   :group 'semantic
   :group 'semantic-modes
   :type 'boolean
-  :require 'semantic-util-modes
+  :require 'semantic/util-modes
   :initialize 'custom-initialize-default
   :set (lambda (sym val)
          (global-semantic-mru-bookmark-mode (if val 1 -1))))