diff options
| author | Joakim Verona | 2013-09-11 08:45:50 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 08:45:50 +0200 |
| commit | 6481f6dd5203af347dca2ff2cf599be8e79fb1b9 (patch) | |
| tree | eccf7c2e96a04f4b8045ddaa2183ba4ad6eb455e /lisp/progmodes/python.el | |
| parent | 95227d0882184659bfe4e1322a3b9e246e145f0b (diff) | |
| parent | 2a08047aed0017cc2b639e189fc3b5d41c46fcbd (diff) | |
| download | emacs-6481f6dd5203af347dca2ff2cf599be8e79fb1b9.tar.gz emacs-6481f6dd5203af347dca2ff2cf599be8e79fb1b9.zip | |
merge from trunk
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 5eecc347f03..5f919bf495f 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -225,7 +225,7 @@ | |||
| 225 | ;;;###autoload | 225 | ;;;###autoload |
| 226 | (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) | 226 | (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) |
| 227 | ;;;###autoload | 227 | ;;;###autoload |
| 228 | (add-to-list 'interpreter-mode-alist (cons (purecopy "\\`python[0-9.]*\\'") 'python-mode)) | 228 | (add-to-list 'interpreter-mode-alist (cons (purecopy "python[0-9.]*") 'python-mode)) |
| 229 | 229 | ||
| 230 | (defgroup python nil | 230 | (defgroup python nil |
| 231 | "Python Language's flying circus support for Emacs." | 231 | "Python Language's flying circus support for Emacs." |