[Emacs-diffs] /srv/bzr/emacs/trunk r110514: * progmodes/python.el (python-mode-map): Replace

[Fabián Ezequiel Gallina]

------------------------------------------------------------
revno: 110514
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-11 21:07:25 -0300
message:
  * progmodes/python.el (python-mode-map): Replace
  subtitute-key-definition with proper command remapping.
  (python-nav--up-list): Fix behavior for blocks on the same level.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-11 20:36:23 +0000
+++ b/lisp/ChangeLog    2012-10-12 00:07:25 +0000
@@ -1,3 +1,9 @@
+2012-10-12  Fabián Ezequiel Gallina  <address@hidden>
+
+       * progmodes/python.el (python-mode-map): Replace
+       subtitute-key-definition with proper command remapping.
+       (python-nav--up-list): Fix behavior for blocks on the same level.
+
 2012-10-11  Stefan Monnier  <address@hidden>
 
        * help-fns.el (describe-function-1): Handle autoloads w/o docstrings.

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-10-09 02:07:26 +0000
+++ b/lisp/progmodes/python.el  2012-10-12 00:07:25 +0000
@@ -229,15 +229,9 @@
 (defvar python-mode-map
   (let ((map (make-sparse-keymap)))
     ;; Movement
-    (substitute-key-definition 'backward-sentence
-                               'python-nav-backward-block
-                               map global-map)
-    (substitute-key-definition 'forward-sentence
-                               'python-nav-forward-block
-                               map global-map)
-    (substitute-key-definition 'backward-up-list
-                               'python-nav-backward-up-list
-                               map global-map)
+    (define-key map [remap backward-sentence] 'python-nav-backward-block)
+    (define-key map [remap forward-sentence] 'python-nav-forward-block)
+    (define-key map [remap backward-up-list] 'python-nav-backward-up-list)
     (define-key map "\C-c\C-j" 'imenu)
     ;; Indent specific
     (define-key map "\177" 'python-indent-dedent-line-backspace)
@@ -1444,7 +1438,7 @@
              (save-excursion
                (let ((indentation (current-indentation)))
                  (while (and (python-nav-backward-block)
-                             (> (current-indentation) indentation))))
+                             (>= (current-indentation) indentation))))
                (point))))
         (and (> (point) prev-block-pos)
              (goto-char prev-block-pos))))