CEDET (development tools) package merged.

[bpt/emacs.git] / lisp / cedet / semantic / db-ebrowse.el

diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index 6101f3a..8c6237f 100644 (file)
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -50,23 +50,18 @@
 ;;       Call it a second time to refresh the Emacs DB with the file.
 ;;
 
+(require 'ebrowse)
+(require 'semantic)
+(require 'semantic/db-file)
+
 (eval-when-compile
   ;; For generic function searching.
   (require 'eieio)
   (require 'eieio-opt)
-  )
-(require 'semantic/db-file)
-(require 'semantic/find)
+  (require 'semantic/find))
 
 (declare-function semantic-add-system-include "semantic/dep")
 
-(eval-and-compile
-  ;; Hopefully, this will allow semanticdb-ebrowse to compile under
-  ;; XEmacs, it just won't run if a user attempts to use it.
-  (condition-case nil
-      (require 'ebrowse)
-    (error nil)))
-
 ;;; Code:
 (defvar semanticdb-ebrowse-default-file-name "BROWSE"
   "The EBROWSE file name used for system caches.")