diff options
| author | Eli Zaretskii | 2010-01-25 12:42:44 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-25 12:42:44 -0500 |
| commit | 639dd35751e5d43072ef14bc679286136a4feae9 (patch) | |
| tree | 93a8f5700a211c913d4628607ee6a10f79ad6790 /lisp/progmodes/python.el | |
| parent | b7faba0c9c3d8cb994720e2cccc92a538196d56d (diff) | |
| parent | e2396d80cbf7e9d20c05eff44c1c8f04ecb9341c (diff) | |
| download | emacs-639dd35751e5d43072ef14bc679286136a4feae9.tar.gz emacs-639dd35751e5d43072ef14bc679286136a4feae9.zip | |
Merge from mainline.
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 94124ad54f0..a6354eff998 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | ;; `forward-into-nomenclature' should be done separately, since it's | 45 | ;; `forward-into-nomenclature' should be done separately, since it's |
| 46 | ;; not specific to Python, and I've installed a minor mode to do the | 46 | ;; not specific to Python, and I've installed a minor mode to do the |
| 47 | ;; job properly in Emacs 23. [CC mode 5.31 contains an incompatible | 47 | ;; job properly in Emacs 23. [CC mode 5.31 contains an incompatible |
| 48 | ;; feature, `c-subword-mode' which is intended to have a similar | 48 | ;; feature, `subword-mode' which is intended to have a similar |
| 49 | ;; effect, but actually only affects word-oriented keybindings.] | 49 | ;; effect, but actually only affects word-oriented keybindings.] |
| 50 | 50 | ||
| 51 | ;; Other things seem more natural or canonical here, e.g. the | 51 | ;; Other things seem more natural or canonical here, e.g. the |