diff options
| author | Andrea Corallo | 2021-04-05 21:00:18 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2021-04-05 21:00:18 +0200 |
| commit | 74b58f28ecbc6fe9d7a60c96c79acfdf2329ff73 (patch) | |
| tree | b1e99508f836a1d12d17eb3072e14b0cfb2ba407 /lisp/progmodes/python.el | |
| parent | 0a3e715e1f5e13874139b4678375b8f5704b800b (diff) | |
| parent | 14d295871a93c37a33d558ec4e8d49a93b787d8e (diff) | |
| download | emacs-74b58f28ecbc6fe9d7a60c96c79acfdf2329ff73.tar.gz emacs-74b58f28ecbc6fe9d7a60c96c79acfdf2329ff73.zip | |
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index afb96974b17..e5c15d148f8 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -241,8 +241,8 @@ | |||
| 241 | ;; 2) Add the following hook in your .emacs: | 241 | ;; 2) Add the following hook in your .emacs: |
| 242 | 242 | ||
| 243 | ;; (add-hook 'python-mode-hook | 243 | ;; (add-hook 'python-mode-hook |
| 244 | ;; #'(lambda () | 244 | ;; (lambda () |
| 245 | ;; (define-key python-mode-map "\C-m" 'newline-and-indent))) | 245 | ;; (define-key python-mode-map "\C-m" 'newline-and-indent))) |
| 246 | 246 | ||
| 247 | ;; I'd recommend the first one since you'll get the same behavior for | 247 | ;; I'd recommend the first one since you'll get the same behavior for |
| 248 | ;; all modes out-of-the-box. | 248 | ;; all modes out-of-the-box. |
| @@ -3976,8 +3976,8 @@ Returns the tracked buffer." | |||
| 3976 | "Finish tracking." | 3976 | "Finish tracking." |
| 3977 | (python-pdbtrack-unset-tracked-buffer) | 3977 | (python-pdbtrack-unset-tracked-buffer) |
| 3978 | (when python-pdbtrack-kill-buffers | 3978 | (when python-pdbtrack-kill-buffers |
| 3979 | (mapc #'(lambda (buffer) | 3979 | (mapc (lambda (buffer) |
| 3980 | (ignore-errors (kill-buffer buffer))) | 3980 | (ignore-errors (kill-buffer buffer))) |
| 3981 | python-pdbtrack-buffers-to-kill)) | 3981 | python-pdbtrack-buffers-to-kill)) |
| 3982 | (setq python-pdbtrack-buffers-to-kill nil)) | 3982 | (setq python-pdbtrack-buffers-to-kill nil)) |
| 3983 | 3983 | ||