[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108019: * lisp/progmodes/python.el: Move hideshow setup to the end.

[Leo Liu]

------------------------------------------------------------
revno: 108019
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-24 22:58:29 +0800
message:
  * lisp/progmodes/python.el: Move hideshow setup to the end.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-24 08:56:31 +0000
+++ b/lisp/ChangeLog    2012-04-24 14:58:29 +0000
@@ -1,3 +1,7 @@
+2012-04-24  Leo Liu  <address@hidden>
+
+       * progmodes/python.el: Move hideshow setup to the end.
+
 2012-04-24  Martin Rudalics  <address@hidden>
 
        * window.el (handle-select-window): Clear echo area since this is

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-04-19 16:50:07 +0000
+++ b/lisp/progmodes/python.el  2012-04-24 14:58:29 +0000
@@ -2468,15 +2468,6 @@
            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 @@
   ;; 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)