Remove Emacs 23 compat code from cedet

* lisp/cedet/ede/proj-elisp.el (project-compile-target):
* lisp/cedet/semantic/bovine/grammar.el (bovine-grammar-expand-form):
* lisp/cedet/semantic/ede-grammar.el (project-compile-target):
Remove Emacs 23 compat code.

diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index a0af4a4ddc51b588d2657f8c81b78288f3692ecb..bcd672133db512d1e8d322b4c04054ef2712b0fd 100644 (file)
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -153,18 +153,9 @@ Bonus: Return a cons cell: (COMPILED . UPTODATE)."
            (let* ((fsrc (expand-file-name src dir))
                   (elc (concat (file-name-sans-extension fsrc) ".elc")))
              (with-no-warnings
-               (if (< emacs-major-version 24)
-                   ;; Does not have `byte-recompile-file'
-                   (if (or (not (file-exists-p elc))
-                           (file-newer-than-file-p fsrc elc))
-                       (progn
-                         (setq comp (1+ comp))
-                         (byte-compile-file fsrc))
-                     (setq utd (1+ utd)))
-
-                 (if (eq (byte-recompile-file fsrc nil 0) t)
-                     (setq comp (1+ comp))
-                   (setq utd (1+ utd)))))))
+                (if (eq (byte-recompile-file fsrc nil 0) t)
+                    (setq comp (1+ comp))
+                  (setq utd (1+ utd))))))
 
            (oref obj source))
     (message "All Emacs Lisp sources are up to date in %s" (eieio-object-name obj))

diff --git a/lisp/cedet/semantic/bovine/grammar.el b/lisp/cedet/semantic/bovine/grammar.el
index 7b835b85097506b82cff4b27c63b9b40b606a0cf..10afb065320e863c3319091393e48a3c892eaa80 100644 (file)
--- a/lisp/cedet/semantic/bovine/grammar.el
+++ b/lisp/cedet/semantic/bovine/grammar.el
@@ -143,8 +143,7 @@ expanded from elsewhere."
               form  (cdr form))
        ;; Hack for dealing with new reading of unquotes outside of
        ;; backquote (introduced in 2010-12-06T16:37:26Z!monnier@iro.umontreal.ca).
-       (when (and (>= emacs-major-version 24)
-                  (listp first)
+        (when (and (listp first)
                   (or (equal (car first) '\,)
                       (equal (car first) '\,@)))
          (if (listp (cadr first))

diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index 2464833859b550658ae5d5a43f89f6ae64eebdd8..d435ff6b6e95658077321827d949e9b8081424f4 100644 (file)
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -142,19 +142,10 @@ Lays claim to all -by.el, and -wy.el files."
                                   (match-string 1 package)))
                     (src (ede-expand-filename obj fname))
                     (csrc (concat (file-name-sans-extension src) ".elc")))
-               (if (< emacs-major-version 24)
-                   ;; Does not have `byte-recompile-file'
-                   (if (or (not (file-exists-p csrc))
-                           (file-newer-than-file-p src csrc))
-                       (progn
-                         (setq comp (1+ comp))
-                         (byte-compile-file src))
-                     (setq utd (1+ utd)))
-                 ;; Emacs 24 and newer
-                 (with-no-warnings
-                   (if (eq (byte-recompile-file src nil 0) t)
-                       (setq comp (1+ comp))
-                     (setq utd (1+ utd))))))))
+                (with-no-warnings
+                  (if (eq (byte-recompile-file src nil 0) t)
+                      (setq comp (1+ comp))
+                    (setq utd (1+ utd)))))))
          (oref obj source))
     (message "All Semantic Grammar sources are up to date in %s" (eieio-object-name obj))
     (cons comp utd)))