diff options
| author | Fabián Ezequiel Gallina | 2014-11-16 17:59:42 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-11-16 17:59:42 -0300 |
| commit | c2e145b237b92e37c7ba5b004d5372178da723e8 (patch) | |
| tree | 07ef35c0624755ff62e7b7ac58c3039e5533ed81 | |
| parent | cbd90e1d30e7dd40d09780ac9924c7f3fe3b2905 (diff) | |
| download | emacs-c2e145b237b92e37c7ba5b004d5372178da723e8.tar.gz emacs-c2e145b237b92e37c7ba5b004d5372178da723e8.zip | |
* lisp/progmodes/python.el (python-mode): Avoid use of set-local to
keep Emacs 24.x compatibility.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c4873c2081b..984f4ce2cd7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-16 Fabián Ezequiel Gallina <fgallina@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-mode): Avoid use of set-local to | ||
| 4 | keep Emacs 24.x compatibility. | ||
| 5 | |||
| 1 | 2014-11-16 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2014-11-16 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * net/shr.el (shr): Move to the new defgroup `web'. | 8 | * net/shr.el (shr): Move to the new defgroup `web'. |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index d6c4199cc94..3e204a92cd3 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -4301,8 +4301,9 @@ Arguments START and END narrow the buffer region to work on." | |||
| 4301 | #'python-indent-line-function) | 4301 | #'python-indent-line-function) |
| 4302 | (set (make-local-variable 'indent-region-function) #'python-indent-region) | 4302 | (set (make-local-variable 'indent-region-function) #'python-indent-region) |
| 4303 | ;; Because indentation is not redundant, we cannot safely reindent code. | 4303 | ;; Because indentation is not redundant, we cannot safely reindent code. |
| 4304 | (setq-local electric-indent-inhibit t) | 4304 | (set (make-local-variable 'electric-indent-inhibit) t) |
| 4305 | (setq-local electric-indent-chars (cons ?: electric-indent-chars)) | 4305 | (set (make-local-variable 'electric-indent-chars) |
| 4306 | (cons ?: electric-indent-chars)) | ||
| 4306 | 4307 | ||
| 4307 | ;; Add """ ... """ pairing to electric-pair-mode. | 4308 | ;; Add """ ... """ pairing to electric-pair-mode. |
| 4308 | (add-hook 'post-self-insert-hook | 4309 | (add-hook 'post-self-insert-hook |