diff options
| author | Kenichi Handa | 2013-09-12 23:48:18 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-09-12 23:48:18 +0900 |
| commit | 56d968a488c68563c5eae8264b7d3adfee9dc684 (patch) | |
| tree | 712adf1c2f7e12ac9d169958ea63760ad42fc6ce /lisp/progmodes/python.el | |
| parent | b5623270b6047528786d4550cebe0b228ecadb6b (diff) | |
| parent | 4dfa4b9bd944fa385b248b5b0b56e95979119420 (diff) | |
| download | emacs-56d968a488c68563c5eae8264b7d3adfee9dc684.tar.gz emacs-56d968a488c68563c5eae8264b7d3adfee9dc684.zip | |
merge trunk
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 be151bf8114..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") '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." |
| @@ -2140,7 +2140,7 @@ the python shell: | |||
| 2140 | 1. When Optional Argument NOMAIN is non-nil everything under an | 2140 | 1. When Optional Argument NOMAIN is non-nil everything under an |
| 2141 | \"if __name__ == '__main__'\" block will be removed. | 2141 | \"if __name__ == '__main__'\" block will be removed. |
| 2142 | 2. When a subregion of the buffer is sent, it takes care of | 2142 | 2. When a subregion of the buffer is sent, it takes care of |
| 2143 | appending extra whitelines so tracebacks are correct. | 2143 | appending extra empty lines so tracebacks are correct. |
| 2144 | 3. Wraps indented regions under an \"if True:\" block so the | 2144 | 3. Wraps indented regions under an \"if True:\" block so the |
| 2145 | interpreter evaluates them correctly." | 2145 | interpreter evaluates them correctly." |
| 2146 | (let ((substring (buffer-substring-no-properties start end)) | 2146 | (let ((substring (buffer-substring-no-properties start end)) |