From: Stefan Kangas <stefankangas@gmail.com>
Date: Fri, 14 Aug 2020 11:03:42 +0000 (+0200)
Subject: Remove Emacs 22 compat code from semantic
X-Git-Tag: emacs-28.0.90~6588
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=744e97ce6d9fc5c3f8653e4840b00ef0cd14278f;p=emacs.git

Remove Emacs 22 compat code from semantic

* lisp/cedet/semantic/bovine/c.el (semantic-c-end-of-macro):
Make into obsolete function alias for 'c-end-of-macro'.
(semantic-lex-cpp-define, semantic-lex-c-macrobits):
* lisp/cedet/semantic/lex-spp.el (semantic-lex-spp-paren-or-list):
Adjust callers.
---

diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 358829a4568..3649d1c2f1f 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -46,27 +46,10 @@
 (declare-function c-forward-conditional "cc-cmds")
 (declare-function ede-system-include-path "ede")
 
-;;; Compatibility
-;;
 (eval-when-compile (require 'cc-mode))
 
-(if (fboundp 'c-end-of-macro)
-    (eval-and-compile
-      (defalias 'semantic-c-end-of-macro 'c-end-of-macro))
-  ;; From cc-mode 5.30
-  (defun semantic-c-end-of-macro ()
-    "Go to the end of a preprocessor directive.
-More accurately, move point to the end of the closest following line
-that doesn't end with a line continuation backslash.
-
-This function does not do any hidden buffer changes."
-    (while (progn
-             (end-of-line)
-             (when (and (eq (char-before) ?\\)
-                        (not (eobp)))
-               (forward-char)
-               t))))
-  )
+(define-obsolete-function-alias 'semantic-c-end-of-macro
+  #'c-end-of-macro "28.1")
 
 ;;; Code:
 (with-suppressed-warnings ((obsolete define-child-mode))
@@ -266,7 +249,7 @@ Return the defined symbol as a special spp lex token."
 	   (semantic-lex-analyzer #'semantic-cpp-lexer)
 	   (raw-stream
 	    (semantic-lex-spp-stream-for-macro (save-excursion
-						 (semantic-c-end-of-macro)
+						 (c-end-of-macro)
 						 ;; HACK - If there's a C comment after
 						 ;; the macro, do not parse it.
 						 (if (looking-back "/\\*.*" beginning-of-define)
@@ -590,7 +573,7 @@ case, we must skip it since it is the ELSE part."
 (define-lex-regex-analyzer semantic-lex-c-macrobits
   "Ignore various forms of #if/#else/#endif conditionals."
   "^\\s-*#\\s-*\\(if\\(n?def\\)?\\|endif\\|elif\\|else\\)"
-  (semantic-c-end-of-macro)
+  (c-end-of-macro)
   (setq semantic-lex-end-point (point))
   nil)
 
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index b8812de05b6..e6e124eb812 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -70,7 +70,7 @@
 (require 'semantic)
 (require 'semantic/lex)
 
-(declare-function semantic-c-end-of-macro "semantic/bovine/c")
+(declare-function c-end-of-macro "cc-engine")
 
 ;;; Code:
 (defvar semantic-lex-spp-macro-symbol-obarray nil
@@ -946,7 +946,7 @@ by another macro."
     (save-excursion
       (let ((start (match-beginning 0))
 	    (end (match-end 0))
-	    (peom (save-excursion (semantic-c-end-of-macro) (point))))
+	    (peom (save-excursion (c-end-of-macro) (point))))
 	(condition-case nil
 	   (progn
 	     ;; This will throw an error if no closing paren can be found.