diff options
| author | Joakim Verona | 2013-08-16 07:26:31 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-16 07:26:31 +0200 |
| commit | 55dff340dfea1812fb55d27428ae708f094cb7a2 (patch) | |
| tree | d9d2e8615704ed0930c154dc60466693ad4d8955 /lisp/progmodes | |
| parent | 6d2a4fc753d8533b4124fe59432bf4991c1db6b7 (diff) | |
| parent | 526e5233cc0e2375798bdc79329a893302fdfb4b (diff) | |
| download | emacs-55dff340dfea1812fb55d27428ae708f094cb7a2.tar.gz emacs-55dff340dfea1812fb55d27428ae708f094cb7a2.zip | |
merge from trunk
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/python.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 70c2e5dec53..01833ffd70b 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -3080,14 +3080,14 @@ not be passed explicitly unless you know what you are doing." | |||
| 3080 | min-indent | 3080 | min-indent |
| 3081 | indent | 3081 | indent |
| 3082 | (if (<= indent children-indent-limit) | 3082 | (if (<= indent children-indent-limit) |
| 3083 | ;; This lays within the children indent offset range, | 3083 | ;; This lies within the children indent offset range, |
| 3084 | ;; so it's a normal children of its parent (i.e., not | 3084 | ;; so it's a normal child of its parent (i.e., not |
| 3085 | ;; a children of a children). | 3085 | ;; a child of a child). |
| 3086 | (cons (cons label pos) tree) | 3086 | (cons (cons label pos) tree) |
| 3087 | ;; Oh noes, a children of a children?!. Fear not, we | 3087 | ;; Oh no, a child of a child?! Fear not, we |
| 3088 | ;; know how to roll. We recursely parse these by | 3088 | ;; know how to roll. We recursively parse these by |
| 3089 | ;; swapping prev-indent and min-indent plus adding this | 3089 | ;; swapping prev-indent and min-indent plus adding this |
| 3090 | ;; newly found item to a fresh subtree. This works, I | 3090 | ;; newly found item to a fresh subtree. This works, I |
| 3091 | ;; promise. | 3091 | ;; promise. |
| 3092 | (cons | 3092 | (cons |
| 3093 | (python-imenu--build-tree | 3093 | (python-imenu--build-tree |