From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Wed, 12 Aug 2015 02:04:11 +0000 (-0300)
Subject: Respect python.el imenu when semantic-mode is off
X-Git-Tag: emacs-25.0.90~1373^2~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf0ed7340098dcb6228566450a99d3cbc0460094;p=emacs.git

Respect python.el imenu when semantic-mode is off

Fixes debbugs:21220

* lisp/cedet/semantic/wisent/python.el: Do not force
wisent-python-default-setup on python-mode-hook.
---

diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index a8348d2ab81..6abeb4a2440 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -534,9 +534,6 @@ Shortens 'code' tags, but passes through for others."
 				      (code . "Code")))
    )
 
-;;;###autoload
-(add-hook 'python-mode-hook 'wisent-python-default-setup)
-
 ;; Make sure the newer python modes pull in the same python
 ;; mode overrides.
 (define-child-mode python-2-mode python-mode "Python 2 mode")