master 1cbabe973b: Remove compat code; assume imenu.el exists

[Stefan Kangas]

branch: master
commit 1cbabe973be88bed5a21d77defc3220034f7c91f
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Remove compat code; assume imenu.el exists
    
    * lisp/progmodes/antlr-mode.el (antlr-mode):
    * lisp/progmodes/cperl-mode.el (cperl-menu):
    * lisp/progmodes/f90.el (f90-mode-map):
    * lisp/progmodes/fortran.el (fortran-menu):
    * lisp/speedbar.el (speedbar-use-imenu-flag): Remove compat code;
    assume imenu.el exists.
---
 lisp/progmodes/antlr-mode.el | 1 -
 lisp/progmodes/cperl-mode.el | 2 +-
 lisp/progmodes/f90.el        | 4 +---
 lisp/progmodes/fortran.el    | 1 -
 lisp/speedbar.el             | 5 ++---
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 4bc6de0c75..d6e2ab8a87 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -2437,7 +2437,6 @@ the default language."
        #'antlr-imenu-create-index-function)
   (set (make-local-variable 'imenu-generic-expression) t) ; fool stupid test
   (and antlr-imenu-name                        ; there should be a global 
variable...
-       (fboundp 'imenu-add-to-menubar)
        (imenu-add-to-menubar
        (if (stringp antlr-imenu-name) antlr-imenu-name "Index")))
   (antlr-set-tabs))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index b79dc65693..e571cee83c 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1091,7 +1091,7 @@ Unless KEEP, removes the old indentation."
     ["Debugger" cperl-db t]
     "----"
     ("Tools"
-     ["Imenu" imenu (fboundp 'imenu)]
+     ["Imenu" imenu]
      ["Imenu on Perl Info" cperl-imenu-on-info (featurep 'imenu)]
      "----"
      ["Ispell PODs" cperl-pod-spell
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index ce8824b85c..342fcb27b3 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -825,9 +825,7 @@ Can be overridden by the value of 
`font-lock-maximum-decoration'.")
          :style toggle :help "Expand abbreviations while typing in this 
buffer"]
         ["Add Imenu Menu" f90-add-imenu-menu
          :active   (not (lookup-key (current-local-map) [menu-bar index]))
-         :included (fboundp 'imenu-add-to-menubar)
-         :help "Add an index menu to the menu-bar"
-         ]))
+         :help "Add an index menu to the menu-bar"]))
     map)
   "Keymap used in F90 mode.")
 
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 86f0be7320..786c5ae804 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -2213,7 +2213,6 @@ arg DO-SPACE prevents stripping the whitespace."
      :style toggle :help "Expand abbreviations while typing in this buffer"]
     ["Add Imenu Menu" imenu-add-menubar-index
      :active   (not (lookup-key (current-local-map) [menu-bar index]))
-     :included (fboundp 'imenu-add-to-menubar)
      :help "Add an index menu to the menu-bar"]))
 
 (provide 'fortran)
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 3ceccfb20c..b12cf3d9c2 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -306,10 +306,9 @@ attached to and added to this list before the new frame is 
initialized."
                       (symbol :tag "Parameter")
                       (sexp :tag "Value"))))
 
-(defcustom speedbar-use-imenu-flag (fboundp 'imenu)
+(defcustom speedbar-use-imenu-flag t
   "Non-nil means use imenu for file parsing, nil to use etags.
-XEmacs prior to 20.4 doesn't support imenu, therefore the default is to
-use etags instead.  Etags support is not as robust as imenu support."
+Etags support is not as robust as imenu support." ; See Bug#51102
   :tag "Use Imenu for tags"
   :group 'speedbar
   :type 'boolean)