# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1270649728 25200
# Node ID 01020f017806437cce48ea312b5e348d61420042
# Parent  30161c82a278f1898c4d31c323527599e2454cfa# Parent  7110c07edd4bdb9b58b235320b9251b4eeea1baf
merging something

diff -r 7110c07edd4b -r 01020f017806 .emacs
--- 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.")