aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorMichael R. Mauger2017-07-05 23:37:13 -0400
committerMichael R. Mauger2017-07-05 23:37:13 -0400
commit7f62a4a7440aee6aacf04036feb3384a6515e48f (patch)
treeeedee2b54ffce3756f9ca3ef5a1e6e48d83472b6 /lisp/progmodes/python.el
parent776635c01abd4aa759e7aa9584b513146978568c (diff)
parent7a0170de20fe1225d3eeac099d1e61a0c0410bf3 (diff)
downloademacs-7f62a4a7440aee6aacf04036feb3384a6515e48f.tar.gz
emacs-7f62a4a7440aee6aacf04036feb3384a6515e48f.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 464b931cffc..6f169123b95 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -273,7 +273,7 @@
273(autoload 'help-function-arglist "help-fns") 273(autoload 'help-function-arglist "help-fns")
274 274
275;;;###autoload 275;;;###autoload
276(add-to-list 'auto-mode-alist (cons (purecopy "\\.pyw?\\'") 'python-mode)) 276(add-to-list 'auto-mode-alist (cons (purecopy "\\.py[iw]?\\'") 'python-mode))
277;;;###autoload 277;;;###autoload
278(add-to-list 'interpreter-mode-alist (cons (purecopy "python[0-9.]*") 'python-mode)) 278(add-to-list 'interpreter-mode-alist (cons (purecopy "python[0-9.]*") 'python-mode))
279 279