* lisp/cedet/semantic: Remove some dead code

[gnu-emacs] / lisp / cedet / semantic / util-modes.el

diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index 744d37ff1896c57c0b11dbedc8a1bd54f7ef0a0a..c080642f670c9093ec42097c7f0fee20de06c2de 100644 (file)
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -1,6 +1,6 @@
 ;;; semantic/util-modes.el --- Semantic minor modes
 
-;; Copyright (C) 2000-2005, 2007-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2000-2005, 2007-2015 Free Software Foundation, Inc.
 
 ;; Authors: Eric M. Ludlam <zappo@gnu.org>
 ;;          David Ponce <david@dponce.com>
@@ -684,15 +684,11 @@ when it lands in the sticky line."
 (defconst semantic-stickyfunc-header-line-format
   (cond ((featurep 'xemacs)
         nil)
-       ((>= emacs-major-version 22)
+       (t
         '(:eval (list
                  ;; Magic bit I found on emacswiki.
                  (propertize " " 'display '((space :align-to 0)))
-                 (semantic-stickyfunc-fetch-stickyline))))
-       ((= emacs-major-version 21)
-        '(:eval (list semantic-stickyfunc-indent-string
-                      (semantic-stickyfunc-fetch-stickyline))))
-       (t nil))
+                 (semantic-stickyfunc-fetch-stickyline)))))
   "The header line format used by stickyfunc mode.")
 
 ;;;###autoload
@@ -719,7 +715,7 @@ minor mode is enabled."
        (unless (boundp 'default-header-line-format)
          ;; Disable if there are no header lines to use.
          (setq semantic-stickyfunc-mode nil)
-         (error "Sticky Function mode requires Emacs 21"))
+         (error "Sticky Function mode requires Emacs"))
        ;; Enable the mode
        ;; Save previous buffer local value of header line format.
        (when (and (local-variable-p 'header-line-format (current-buffer))