From 86448219a0fc74568b43dfbf1e345e2b1f1cf2a1 Mon Sep 17 00:00:00 2001
From: John Doty <jddoty@gmail.com>
Date: Fri, 2 May 2014 14:28:20 -0700
Subject: [PATCH] Some elisp tweaks, and more

---
 .emacs.d/core.el   | 16 +++++++++-------
 .emacs.d/custom.el | 10 +++++++++-
 .gitignore         |  1 +
 .history           |  9 ---------
 4 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 .history

diff --git a/.emacs.d/core.el b/.emacs.d/core.el
index 07da96b..de8a5a3 100644
--- a/.emacs.d/core.el
+++ b/.emacs.d/core.el
@@ -178,7 +178,7 @@
         (height           . ,jd-frame-height)))
 
 ;; This is just here for playing with things.
-;;(set-frame-font my-font-choice)
+;; (set-frame-font my-font-choice)
 
 ;; COLORZ!
 ;;
@@ -586,10 +586,12 @@
 (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode))
 
 (require 'tss)
-  (setq tss-popup-help-key "C-:")
-  (setq tss-jump-to-definition-key "C->")
-  (tss-config-default)
-(defun my-typescript-hook ()
-)
+(setq tss-popup-help-key "C-:")
+(setq tss-jump-to-definition-key "C->")
+(tss-config-default)
 
-(add-hook 'typescript-mode-hook 'my-typescript-hook)
+;; =================================================================
+;; Archive mode for appx
+;; =================================================================
+(add-to-list 'auto-mode-alist '("\\.appx\\'" . archive-mode))
+(add-to-list 'auto-coding-alist '("\\.appx\\'" . no-conversion))
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 6ef5512..04f2f5e 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -22,8 +22,9 @@
  '(indent-tabs-mode nil)
  '(inhibit-startup-screen t)
  '(ispell-program-name "aspell")
- '(js2-basic-offset 2)
+ '(js2-basic-offset 4)
  '(js2-bounce-indent-p t)
+ '(js2-strict-trailing-comma-warning nil)
  '(make-backup-files nil)
  '(mouse-buffer-menu-mode-mult 0)
  '(org-hide-leading-stars t)
@@ -40,6 +41,13 @@
  '(tags-revert-without-query t)
  '(transient-mark-mode t)
  '(truncate-lines t)
+ '(use-dialog-box nil)
  '(which-func-mode-global t nil (which-func))
  '(widget-editable-list-gui t)
  '(x-stretch-cursor nil))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
diff --git a/.gitignore b/.gitignore
index 26f3a90..b7dfede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.history
 .aptitude/
 .bash_history
 .bash_logout
diff --git a/.history b/.history
deleted file mode 100644
index 0f65965..0000000
--- a/.history
+++ /dev/null
@@ -1,9 +0,0 @@
-set
-set GOPATH
-set GoPath=
-set GOPATH
-set GoPath=
-exit
-set
-set go
-exit