changeset 61:01020f017806

merging something
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 07 Apr 2010 07:15:28 -0700
parents 30161c82a278 (diff) 7110c07edd4b (current diff)
children c11f2794a123
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.emacs	Sat Apr 03 03:21:33 2010 -0400
+++ b/.emacs	Wed Apr 07 07:15:28 2010 -0700
@@ -6,7 +6,7 @@
 (setq truncate-lines nil)
 (setq truncate-partial-width-windows nil) 
 (setq use-file-dialog nil)
-(setq python-indent 4)
+(setq python-indent 2)
 (setq python-guess-indent nil)
 (setq-default indent-tabs-mode nil)
 (defface extra-whitespace-face '((t (:background "pale green"))) "Used for tabs and such.")