changeset 78:144233173384

dont know what im doing or why i have to do it
author Jeff Hammel <jhammel@mozilla.com>
date Sun, 20 Jun 2010 22:26:55 -0700
parents 84ffa220796a (diff) db859ed2585c (current diff)
children 413945f4c18b
files
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.bashrc	Thu May 27 22:10:34 2010 -0700
+++ b/.bashrc	Sun Jun 20 22:26:55 2010 -0700
@@ -88,7 +88,7 @@
     else
 	FILENAME=$2
     fi
-    CMD='command find -L $PWD -iname "${FILENAME}" -print0 | xargs -r0 grep -il "$1" | egrep -v "${EXCLUDES}"'
+    CMD='command find -L $PWD -iname "${FILENAME}" -print0 2> /dev/null | xargs -r0 grep -il "$1" 2> /dev/null | egrep -v "${EXCLUDES}" 2> /dev/null'
 #    echo $CMD
     eval $CMD
 
--- a/.emacs	Thu May 27 22:10:34 2010 -0700
+++ b/.emacs	Sun Jun 20 22:26:55 2010 -0700
@@ -6,9 +6,17 @@
 (setq truncate-lines nil)
 (setq truncate-partial-width-windows nil) 
 (setq use-file-dialog nil)
+
+;; indentation
+
+;; python indentation
 (setq python-indent 2)
 (setq-default py-indent-offset 2)
 (setq python-guess-indent nil)
+
+;; javascript indentation: http://www.brgeight.se/downloads/emacs/javascript.el
+(setq javascript-indent-level 2)
+
 (setq-default indent-tabs-mode nil)
 (defface extra-whitespace-face '((t (:background "pale green"))) "Used for tabs and such.")
 
--- a/.hgignore	Thu May 27 22:10:34 2010 -0700
+++ b/.hgignore	Sun Jun 20 22:26:55 2010 -0700
@@ -7,4 +7,5 @@
 *~
 build
 dist
-#*
\ No newline at end of file
+#*
+._*