Remove some compat code from CEDET

* lisp/cedet/semantic.el (pp):
* lisp/cedet/semantic/complete.el (initialize-instance): Remove
old-Emacs compat code.

diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 0b878cae525fa22fc25ce359999a34d3ae24c54c..7d5017c6209ace0b8ea5cf4730c207e0d35f3751 100644 (file)
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -368,8 +368,7 @@ to use Semantic, and `semantic-init-hook' is run."
 \f
 ;;; Parsing Commands
 ;;
-(eval-when-compile
-  (condition-case nil (require 'pp) (error nil)))
+(require 'pp)
 
 (defvar semantic-edebug nil
   "When non-nil, activate the interactive parsing debugger.

diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 14d2bd38ee8e3a20b79c9d16e96c7a79dcb2cff2..29f33d4a10bcb79efd1696bad2a541ca7013108c 100644 (file)
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1666,10 +1666,7 @@ Display mechanism using tooltip for a list of possible completions.")
 
 (cl-defmethod initialize-instance :after ((obj semantic-displayer-tooltip) &rest args)
   "Make sure we have tooltips required."
-  (condition-case nil
-      (require 'tooltip)
-    (error nil))
-  )
+  (require 'tooltip))
 
 (defvar tooltip-mode)