diff options
| author | Paul Eggert | 2011-06-15 11:07:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-15 11:07:38 -0700 |
| commit | ff672d2c8785de6faba84a400fb8153e9fa07cd2 (patch) | |
| tree | 4c5dc68b7a92e54c86e47f3bd9a804c14be57091 /lisp/progmodes/python.el | |
| parent | e69dafade3ccd5c2997a3f6fd6c7bea29e75ad8e (diff) | |
| parent | b96e6cde3e311cd79f8ad134291d41c8c64cc6ad (diff) | |
| download | emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.tar.gz emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.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 b99cad1d081..3d243f14f07 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2420,7 +2420,7 @@ without confirmation." | |||
| 2420 | (defvar python-mode-running) ;Dynamically scoped var. | 2420 | (defvar python-mode-running) ;Dynamically scoped var. |
| 2421 | 2421 | ||
| 2422 | ;;;###autoload | 2422 | ;;;###autoload |
| 2423 | (define-derived-mode python-mode fundamental-mode "Python" | 2423 | (define-derived-mode python-mode prog-mode "Python" |
| 2424 | "Major mode for editing Python files. | 2424 | "Major mode for editing Python files. |
| 2425 | Turns on Font Lock mode unconditionally since it is currently required | 2425 | Turns on Font Lock mode unconditionally since it is currently required |
| 2426 | for correct parsing of the source. | 2426 | for correct parsing of the source. |