Remove XEmacs compat code from cedet

* lisp/cedet/srecode/mode.el (srecode-menu-bar):
* lisp/cedet/semantic/wisent/comp.el (wisent-debug-flag)
(wisent-print-results):
* lisp/cedet/semantic/util-modes.el
(semantic-stickyfunc-indent-string)
(semantic-stickyfunc-header-line-format)
(semantic-highlight-func-mode-map):
* lisp/cedet/semantic/symref/list.el
(semantic-symref-list-menu-entries):
* lisp/cedet/semantic/idle.el ()
(semantic-idle-breadcrumbs-popup-menu):
* lisp/cedet/semantic/grammar.el (semantic-grammar-item-value)
(semantic-grammar-create-package)
(semantic-grammar-batch-build-packages)
(semantic-grammar-setup-menu):
* lisp/cedet/semantic/fw.el (semantic-overlay-live-p)
(semantic-event-window, semantic-make-local-hook)
(semantic-run-mode-hooks, semantic-subst-char-in-string)
(semantic-menu-item, semantic-find-file-noselect):
* lisp/cedet/semantic/format.el (semantic-format-face-alist)
(semantic--format-colorize-merge-text):
* lisp/cedet/semantic/decorate/include.el ()
(semantic-decoration-on-include-menu)
(semantic-decoration-on-unknown-include-menu)
(semantic-decoration-on-fileless-include-menu)
(semantic-decoration-on-unparsed-include-menu):
* lisp/cedet/semantic/decorate.el (semantic-set-tag-read-only)
(semantic-tag-read-only-p):
* lisp/cedet/mode-local.el (activate-mode-local-bindings):
* lisp/cedet/data-debug.el (data-debug-overlay-properties): Remove
XEmacs compat code.

1 files changed, 19 insertions, 26 deletions

diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index 7d040fd84af..25a18581d8e 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -92,12 +92,8 @@ Images can be used as icons instead of some types of text strings."
      (variable . font-lock-variable-name-face)
      (type . font-lock-type-face)
      ;; These are different between Emacsen.
-     (include . ,(if (featurep 'xemacs)
-		     'font-lock-preprocessor-face
-		   'font-lock-constant-face))
-     (package . ,(if (featurep 'xemacs)
-		     'font-lock-preprocessor-face
-		   'font-lock-constant-face))
+     (include . ,'font-lock-constant-face)
+     (package . , 'font-lock-constant-face)
      ;; Not a tag, but instead a feature of output
      (label . font-lock-string-face)
      (comment . font-lock-comment-face)
@@ -135,26 +131,23 @@ See that variable for details on adding new types."
 FACE-CLASS is a tag type found in `semantic-formatface-alist'.
 See that variable for details on adding new types."
   (let ((face (cdr-safe (assoc face-class semantic-format-face-alist)))
-	(newtext (concat precoloredtext))
-	)
-    (if (featurep 'xemacs)
-	(add-text-properties 0 (length newtext) (list 'face face) newtext)
-      (alter-text-property 0 (length newtext) 'face
-			   (lambda (current-face)
-			     (let ((cf
-				    (cond ((facep current-face)
-					   (list current-face))
-					  ((listp current-face)
-					   current-face)
-					  (t nil)))
-				   (nf
-				    (cond ((facep face)
-					   (list face))
-					  ((listp face)
-					   face)
-					  (t nil))))
-			       (append cf nf)))
-			   newtext))
+	(newtext (concat precoloredtext)))
+    (alter-text-property 0 (length newtext) 'face
+			 (lambda (current-face)
+			   (let ((cf
+				  (cond ((facep current-face)
+					 (list current-face))
+					((listp current-face)
+					 current-face)
+					(t nil)))
+				 (nf
+				  (cond ((facep face)
+					 (list face))
+					((listp face)
+					 face)
+					(t nil))))
+			     (append cf nf)))
+			 newtext)
     newtext))
 
 ;;; Function Arguments