Mercurial > emacs
comparison lisp/progmodes/python.el @ 90718:f1d13e615070
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 523-544)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 168-171)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 07 Dec 2006 04:14:14 +0000 |
| parents | dbe3f29e61d6 1c8bca402ae7 |
| children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
| 90717:06937e972ad0 | 90718:f1d13e615070 |
|---|---|
| 406 (defcustom python-indent 4 | 406 (defcustom python-indent 4 |
| 407 "Number of columns for a unit of indentation in Python mode. | 407 "Number of columns for a unit of indentation in Python mode. |
| 408 See also `\\[python-guess-indent]'" | 408 See also `\\[python-guess-indent]'" |
| 409 :group 'python | 409 :group 'python |
| 410 :type 'integer) | 410 :type 'integer) |
| 411 (put 'python-indent 'safe-local-variable 'integerp) | |
| 411 | 412 |
| 412 (defcustom python-guess-indent t | 413 (defcustom python-guess-indent t |
| 413 "Non-nil means Python mode guesses `python-indent' for the buffer." | 414 "Non-nil means Python mode guesses `python-indent' for the buffer." |
| 414 :type 'boolean | 415 :type 'boolean |
| 415 :group 'python) | 416 :group 'python) |