* lisp/progmodes/python.el: Move hideshow setup to the end.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b5c9d75e9edc7f9f1984f061e58c2a125b4e8cb..b1f1ad99b233cfa4e855c292d1f86691c383a03b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-24  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/python.el: Move hideshow setup to the end.
+
 2012-04-24  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (handle-select-window): Clear echo area since this is

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2922330e6f9b030de879246393e68a8c4aa0fab0..f88d77d214d5617059d545110b21e0acfd987401 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2468,15 +2468,6 @@ with skeleton expansions for compound statement templates.
            nil t)
   (add-hook 'completion-at-point-functions
             'python-completion-at-point nil 'local)
-  ;; Fixme: should be in hideshow.  This seems to be of limited use
-  ;; since it isn't (can't be) indentation-based.  Also hide-level
-  ;; doesn't seem to work properly.
-  (add-to-list 'hs-special-modes-alist
-              `(python-mode "^\\s-*\\(?:def\\|class\\)\\>" nil "#"
-                ,(lambda (_arg)
-                   (python-end-of-defun)
-                   (skip-chars-backward " \t\n"))
-                nil))
   (set (make-local-variable 'skeleton-further-elements)
        '((< '(backward-delete-char-untabify (min python-indent
                                                 (current-column))))
@@ -2717,6 +2708,17 @@ comint believe the user typed this string so that
   ;; continue standard unloading
   nil)
 
+;;;; Finish up
+;; Fixme: should be in hideshow.  This seems to be of limited use
+;; since it isn't (can't be) indentation-based.  Also hide-level
+;; doesn't seem to work properly.
+(add-to-list 'hs-special-modes-alist
+             `(python-mode "^\\s-*\\(?:def\\|class\\)\\>" nil "#"
+                           ,(lambda (_arg)
+                              (python-end-of-defun)
+                              (skip-chars-backward " \t\n"))
+                           nil))
+
 (provide 'python)
 (provide 'python-21)