diff options
| author | Fabián Ezequiel Gallina | 2015-08-11 23:04:11 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2015-08-11 23:04:11 -0300 |
| commit | bf0ed7340098dcb6228566450a99d3cbc0460094 (patch) | |
| tree | 2b318ca6852fb7de7ce9c616f0fe3d2758fbe7ca | |
| parent | d6640d6e4c4f1a85edf924bca0f8a90d1aa6341a (diff) | |
| download | emacs-bf0ed7340098dcb6228566450a99d3cbc0460094.tar.gz emacs-bf0ed7340098dcb6228566450a99d3cbc0460094.zip | |
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.
| -rw-r--r-- | lisp/cedet/semantic/wisent/python.el | 3 |
1 files changed, 0 insertions, 3 deletions
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." | |||
| 534 | (code . "Code"))) | 534 | (code . "Code"))) |
| 535 | ) | 535 | ) |
| 536 | 536 | ||
| 537 | ;;;###autoload | ||
| 538 | (add-hook 'python-mode-hook 'wisent-python-default-setup) | ||
| 539 | |||
| 540 | ;; Make sure the newer python modes pull in the same python | 537 | ;; Make sure the newer python modes pull in the same python |
| 541 | ;; mode overrides. | 538 | ;; mode overrides. |
| 542 | (define-child-mode python-2-mode python-mode "Python 2 mode") | 539 | (define-child-mode python-2-mode python-mode "Python 2 mode") |