Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 648c562b2f233baa771a37af9fa00aab5f3c209f..5c567fac788f0347ebe323c0af27de82db069d3c 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -828,6 +828,7 @@
 (progn
   (setq-default py-indent-offset 2
                python-indent 2
 (progn
   (setq-default py-indent-offset 2
                python-indent 2

+               python-indent-offset 2

                py-python-command-args
                `("-i" "-colors" ,(if mdw-black-background
                                      "Linux" "LightBG")))
                py-python-command-args
                `("-i" "-colors" ,(if mdw-black-background
                                      "Linux" "LightBG")))