From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 19 Oct 2019 09:00:21 +0000 (+0200)
Subject: Remove some compat code from CEDET
X-Git-Tag: emacs-27.0.90~989
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3726f057b6467d9c4ff0e09d4b86d89bdd380a4;p=emacs.git

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 0b878cae525..7d5017c6209 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -368,8 +368,7 @@ to use Semantic, and `semantic-init-hook' is run."
 
 ;;; 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 14d2bd38ee8..29f33d4a10b 100644
--- 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)