From 19ba2b8e13c2a1f2a74d02b6d5ec63ac156d12d2 Mon Sep 17 00:00:00 2001
From: Eric Schwartz <eschwartz@comverge.com>
Date: Wed, 29 Feb 2012 09:39:47 -0700
Subject: [PATCH] Adding new coding modes; turn on column-mode as well as
 linum-mode

---
 .gitignore            |  1 +
 init.d/01_packages.el |  2 +-
 init.d/code.el        |  7 +++++++
 init.d/editing.el     |  4 ++++
 url/cookies           | 15 ---------------
 5 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 url/cookies

diff --git a/.gitignore b/.gitignore
index 31281ed..ed2781c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
+url/cookies
 backup/
 elpa/
diff --git a/init.d/01_packages.el b/init.d/01_packages.el
index a325d5c..a876a86 100644
--- a/init.d/01_packages.el
+++ b/init.d/01_packages.el
@@ -3,7 +3,7 @@
 ;; package loading stuff
 (package-initialize)
 (setq ems-required-packages
-      (list 'xml-rpc 'magit 'gh 'textmate 'inf-ruby 'yaml-mode 'scss-mode 'ruby-compilation 'feature-mode 'coffee-mode))
+      (list 'xml-rpc 'magit 'gh 'textmate 'inf-ruby 'yaml-mode 'scss-mode 'ruby-compilation 'feature-mode 'coffee-mode 'js2-mode))
 (dolist (package ems-required-packages)
   (when (not (package-installed-p package))
     (package-refresh-contents)
diff --git a/init.d/code.el b/init.d/code.el
index dd784e1..b88cfe3 100644
--- a/init.d/code.el
+++ b/init.d/code.el
@@ -2,4 +2,11 @@
 (add-hook 'ems-code-modes-hook
 	  (lambda ()
             (linum-mode 1)
+            (column-mode)
             (textmate-mode)))
+
+(require 'yaml-mode)
+(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\$" . js2-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\.erb$" . js2-mode))
+(add-to-list 'auto-mode-alist '("\\.rake\\$". ruby-mode))
diff --git a/init.d/editing.el b/init.d/editing.el
index 99e2bfd..40cdb99 100644
--- a/init.d/editing.el
+++ b/init.d/editing.el
@@ -2,3 +2,7 @@
 
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
 (setq-default indent-tabs-mode nil)
+
+(setq frame-title-format
+  '((buffer-file-name "%f" (dired-directory dired-directory "%b")) " - "
+    invocation-name "@" system-name))
diff --git a/url/cookies b/url/cookies
deleted file mode 100644
index ecc8204..0000000
--- a/url/cookies
+++ /dev/null
@@ -1,15 +0,0 @@
-;; Emacs-W3 HTTP cookies file
-;; Automatically generated file!!! DO NOT EDIT!!!
-
-(setq url-cookie-storage
- '(("marmalade-repo.org"
-  [url-cookie "connect.sid" "217fee35c1b8459f8410caad0d3.3e75902ca193d14b3ec8c68c583871ef" "Thu, 10 Nov 2011 23:00:13 GMT" "/" "marmalade-repo.org" nil]
-  [url-cookie "httpOnly" nil "Thu, 10 Nov 2011 23:00:13 GMT" "/" "marmalade-repo.org" nil]))
-)
-(setq url-cookie-secure-storage
- 'nil)
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; End: