From 1cf489c1657378e95057d795234c99df128391a6 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 15 Aug 2019 18:10:22 -0700
Subject: [PATCH] Fix up previous cl-def* changes in bovine

* lisp/cedet/semantic/bovine/el.el (lambda): cl-defun* doesn't
exist (bug#17005).
(lambda): Add cl-defstruct.
(semantic-up-context): Add cl- forms.
---
 lisp/cedet/semantic/bovine/el.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index ba8307d2a4b..b4217080b66 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -249,7 +249,6 @@ Return a bovination list to use."
   defsubst
   defmacro
   cl-defun
-  cl-defun*
   cl-defsubst
   cl-defmacro
   define-overload ;; @todo - remove after cleaning up semantic.
@@ -396,6 +395,7 @@ Return a bovination list to use."
          (cons nil nil)
          )))
   defstruct
+  cl-defstruct
   )
 
 (semantic-elisp-setup-form-parser
@@ -614,7 +614,7 @@ Returns non-nil it is not possible to go up a context."
   (let ((last-up (semantic-up-context-default)))
   (while
       (and (not (looking-at
-		 "(\\(let\\*?\\|def\\(un\\|method\\|generic\\|\
+		 "(\\(let\\*?\\|\\(?:cl-\\)?def\\(un\\|method\\|generic\\|\
 define-mode-overload\\)\
 \\|with-slots\\)"))
 	   (not last-up))
-- 
2.39.2