diff options
| author | Po Lu | 2023-01-30 21:19:55 +0800 |
|---|---|---|
| committer | Po Lu | 2023-01-30 21:19:55 +0800 |
| commit | 46e8ab23eaeb5e453042f430fc016cf9ffc2ac37 (patch) | |
| tree | e01b8db7b92c7e823b0957f4c3cd5db7a68fef23 /lisp/progmodes/python.el | |
| parent | f69583941c873506b017bd5f5a81a3dfe15d7e22 (diff) | |
| parent | 3f069bd796b0024033640051b5f74ba9834985f8 (diff) | |
| download | emacs-46e8ab23eaeb5e453042f430fc016cf9ffc2ac37.tar.gz emacs-46e8ab23eaeb5e453042f430fc016cf9ffc2ac37.zip | |
Merge remote-tracking branch 'origin/master' into feature/android
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 a869cdc5fdb..df0d1c96965 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -6715,8 +6715,8 @@ implementations: `python-mode' and `python-ts-mode'." | |||
| 6715 | (when python-indent-guess-indent-offset | 6715 | (when python-indent-guess-indent-offset |
| 6716 | (python-indent-guess-indent-offset)) | 6716 | (python-indent-guess-indent-offset)) |
| 6717 | 6717 | ||
| 6718 | (add-to-list 'auto-mode-alist | 6718 | (add-to-list 'auto-mode-alist '("\\.py[iw]?\\'" . python-ts-mode)) |
| 6719 | '("\\.py[iw]?\\'\\|python[0-9.]*" . python-ts-mode)))) | 6719 | (add-to-list 'interpreter-mode-alist '("python[0-9.]*" . python-ts-mode)))) |
| 6720 | 6720 | ||
| 6721 | ;;; Completion predicates for M-x | 6721 | ;;; Completion predicates for M-x |
| 6722 | ;; Commands that only make sense when editing Python code | 6722 | ;; Commands that only make sense when editing Python code |