diff options
| author | Joakim Verona | 2015-01-21 00:26:56 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-21 00:26:56 +0100 |
| commit | 8628a48fec7fcd8bdbbf6ce5808fc574631d1541 (patch) | |
| tree | 3dfc3b71850123e7514ddb149a0ba768618cfddf /lisp/progmodes/python.el | |
| parent | ffd9ee1d6412a6e61383930562e6167a458f0d5f (diff) | |
| parent | 0dd19ac82662c5710e73852f438fd55e1d9225b7 (diff) | |
| download | emacs-8628a48fec7fcd8bdbbf6ce5808fc574631d1541.tar.gz emacs-8628a48fec7fcd8bdbbf6ce5808fc574631d1541.zip | |
Merge branch 'master' into xwidget
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1e8623dd901..d298f96bc81 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -4662,8 +4662,8 @@ Arguments START and END narrow the buffer region to work on." | |||
| 4662 | (current-column)))) | 4662 | (current-column)))) |
| 4663 | (^ '(- (1+ (current-indentation)))))) | 4663 | (^ '(- (1+ (current-indentation)))))) |
| 4664 | 4664 | ||
| 4665 | (set (make-local-variable 'eldoc-documentation-function) | 4665 | (add-function :before-until (local 'eldoc-documentation-function) |
| 4666 | #'python-eldoc-function) | 4666 | #'python-eldoc-function) |
| 4667 | 4667 | ||
| 4668 | (add-to-list 'hs-special-modes-alist | 4668 | (add-to-list 'hs-special-modes-alist |
| 4669 | `(python-mode "^\\s-*\\(?:def\\|class\\)\\>" nil "#" | 4669 | `(python-mode "^\\s-*\\(?:def\\|class\\)\\>" nil "#" |