diff options
| author | Daniel Colascione | 2014-04-07 13:54:16 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2014-04-07 13:54:16 -0700 |
| commit | 7e31acf6b81fdce7258077645bc239767c484841 (patch) | |
| tree | 1f0d7b063a19b54982550797df063e0a9f87eaed /lisp/progmodes/python.el | |
| parent | 608a4502b9fa8f5681368657fba5d5fd0fa46817 (diff) | |
| parent | e3b838807bf9fbbbec9826de6c1e4efdf72acb78 (diff) | |
| download | emacs-7e31acf6b81fdce7258077645bc239767c484841.tar.gz emacs-7e31acf6b81fdce7258077645bc239767c484841.zip | |
Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index b0102c55ffd..240cf8aff8c 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -3651,8 +3651,9 @@ returned as is." | |||
| 3651 | (let ((count 0)) | 3651 | (let ((count 0)) |
| 3652 | (while (eq (char-before (- (point) count)) last-command-event) | 3652 | (while (eq (char-before (- (point) count)) last-command-event) |
| 3653 | (cl-incf count)) | 3653 | (cl-incf count)) |
| 3654 | (= count 3))) | 3654 | (= count 3)) |
| 3655 | (save-excursion (insert (make-string 3 last-command-event))))) | 3655 | (eq (char-after) last-command-event)) |
| 3656 | (save-excursion (insert (make-string 2 last-command-event))))) | ||
| 3656 | 3657 | ||
| 3657 | (defvar electric-indent-inhibit) | 3658 | (defvar electric-indent-inhibit) |
| 3658 | 3659 | ||