Merge branch 'master' of gitorious.org:ryuslashdotfiles/dotemacs

3 files changed, 116 insertions, 9 deletions

diff --git a/dotemacs/.emacs b/dotemacs/.emacs
index 66c3bcb..9d928fc 100644
--- a/dotemacs/.emacs
+++ b/dotemacs/.emacs
@@ -5,20 +5,21 @@
 (require 'uniquify)
 (require 'autopair)
 (require 'color-theme)
+(require 'flymake)
 
 ;; Autoloads
 (autoload 'vala-mode
-  "vala-mode.el"    "A Major mode for editing Vala files"        t)
+  "vala-mode.elc"    "A Major mode for editing Vala files"        t)
 (autoload 'csharp-mode
-  "csharp-mode.el"  "A Major mode for editing C# files"          t)
+  "csharp-mode.elc"  "A Major mode for editing C# files"          t)
 (autoload 'javascript-mode
-  "javascript.el"   "A Major mode for editing JavaScript files"  t)
+  "javascript.elc"   "A Major mode for editing JavaScript files"  t)
 (autoload 'sqlplus-mode
-  "sqlplus,el"      "A Major mode for communicating with Oracle" t)
+  "sqlplus,elc"      "A Major mode for communicating with Oracle" t)
 (autoload 'batch-mode
-  "batch-mode.el"   "A Major mode for editing Batch files"       t)
+  "batch-mode.elc"   "A Major mode for editing Batch files"       t)
 (autoload 'rainbow-mode
-  "rainbow-mode.el" "A Minor mode for showing colors inline"     t)
+  "rainbow-mode.elc" "A Minor mode for showing colors inline"     t)
 
 ;; Functions
 (defun what-face (pos)
@@ -38,7 +39,7 @@
 
 ;; Platform specifics
 (if (eq system-type 'gnu/linux) ; if we're running linux
-    (set-default-font "-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"))
+    (set-frame-font "-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"))
 
 ;; Variables
 (setq
@@ -47,8 +48,7 @@
  font-lock-maximum-decoration t ; denotes my interest in maximum possible fontification
  uniquify-buffer-name-style 'reverse ; reverse uniquify file names
  backup-directory-alist `((".*" . ,temporary-file-directory)) ; backup filelocation
- auto-save-file-name-transforms `((".*" ,temporary-file-directory t)) ; autosave file location
- compilation-finish-function 'my-comp-finish-function) ; show short message after compilation
+ auto-save-file-name-transforms `((".*" ,temporary-file-directory t))) ; autosave file location
 
 (setq-default indent-tabs-mode nil)          ; spaces, no tabs
 
@@ -77,6 +77,11 @@
 (add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
 (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))
 
+(add-to-list 'compilation-finish-functions 'my-comp-finish-function)
+
 ;; Color theme
 (require 'color-theme-weirdness)
 (color-theme-weirdness)
+
+;; Hooks
+(add-hook 'find-file-hook 'flymake-find-file-hook)
diff --git a/dotemacs/.emacs.d/color-theme-gruber-darker.el b/dotemacs/.emacs.d/color-theme-gruber-darker.el
new file mode 100644
index 0000000..5ee82a2
--- /dev/null
+++ b/dotemacs/.emacs.d/color-theme-gruber-darker.el
@@ -0,0 +1,101 @@
+;; color-theme-gruber-dark.el
+;; Revision 1
+;;
+;; Copyright (C) 2009-2010 Jason R. Blevins
+;;
+;; Permission is hereby granted, free of charge, to any person
+;; obtaining a copy of this software and associated documentation
+;; files (the "Software"), to deal in the Software without
+;; restriction, including without limitation the rights to use,
+;; copy, modify, merge, publish, distribute, sublicense, and/or sell
+;; copies of the Software, and to permit persons to whom the
+;; Software is furnished to do so, subject to the following
+;; conditions:
+;;
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
+;;
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+;; OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+;; WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+;; OTHER DEALINGS IN THE SOFTWARE.
+
+(require 'color-theme)
+
+(defun color-theme-gruber-darker ()
+  "Gruber Darker color theme for Emacs by Jason Blevins.
+A darker variant of the Gruber Dark theme for BBEdit
+by John Gruber."
+  (interactive)
+  (color-theme-install
+   '(color-theme-gruber-darker
+     ((foreground-color . "#e4e4ef")
+      (background-color . "#181818")
+      (background-mode . dark)
+      (cursor-color . "#ffdd33")
+      (mouse-color . "#ffdd33"))
+
+     ;; Standard font lock faces
+     (default ((t (nil))))
+     (font-lock-comment-face ((t (:foreground "#cc8c3c"))))
+     (font-lock-comment-delimiter-face ((t (:foreground "#cc8c3c"))))
+     (font-lock-doc-face ((t (:foreground "#73c936"))))
+     (font-lock-doc-string-face ((t (:foreground "#73c936"))))
+     (font-lock-string-face ((t (:foreground "#73c936"))))
+     (font-lock-keyword-face ((t (:foreground "#ffdd33"))))
+     (font-lock-builtin-face ((t (:foreground "#ffdd33"))))
+     (font-lock-function-name-face ((t (:foreground "#96a6c8"))))
+     (font-lock-variable-name-face ((t (:foreground "#f4f4ff"))))
+     (font-lock-preprocessor-face ((t (:foreground "#95a99f"))))
+     (font-lock-constant-face ((t (:foreground "#95a99f"))))
+     (font-lock-type-face ((t (:foreground "#95a99f"))))
+     (font-lock-warning-face ((t (:foreground "#f43841"))))
+     (font-lock-reference-face ((t (:foreground "#95a99f"))))
+     (trailing-whitespace ((t (:foreground "#000" :background "#f43841"))))
+     (link ((t (:foreground "#96A6C8" :underline t))))
+
+     ;; Search
+     (isearch ((t (:foreground "#000" :background "#f5f5f5"))))
+     (isearch-lazy-highlight-face ((t (:foreground "#f4f4ff" :background "#5f627f"))))
+     (isearch-fail ((t (:foreground "#000" :background "#f43841"))))
+
+     ;; User interface
+     (fringe ((t (:background "#111" :foreground "#444"))))
+     (border ((t (:background "#111" :foreground "#444"))))
+     (mode-line ((t (:background "#453d41" :foreground "#fff"))))
+     (mode-line-buffer-id ((t (:background "#453d41" :foreground "#fff"))))
+     (mode-line-inactive ((t (:background "#453d41" :foreground "#999"))))
+     (minibuffer-prompt ((t (:foreground "#96A6C8"))))
+     (region ((t (:background "#484848"))))
+     (secondary-selection ((t (:background "#484951" :foreground "#F4F4FF"))))
+     (tooltip ((t (:background "#52494e" :foreground "#fff"))))
+
+     ;; Parenthesis matching
+     (show-paren-match-face ((t (:background "#52494e" :foreground "#f4f4ff"))))
+     (show-paren-mismatch-face ((t (:foreground "#f4f4ff" :background "#c73c3f"))))
+     ;; Line highlighting
+     (highlight ((t (:background "#282828" :foreground nil))))
+     (highlight-current-line-face ((t (:background "#282828" :foreground nil))))
+
+     ;; Calendar
+     (holiday-face ((t (:foreground "#f43841"))))
+
+     ;; Info
+     (info-xref ((t (:foreground "#96a6c8"))))
+     (info-visited ((t (:foreground "#9e95c7"))))
+
+     ;; AUCTeX
+     (font-latex-sectioning-5-face ((t (:foreground "#96a6c8" :bold t))))
+     (font-latex-bold-face ((t (:foreground "#95a99f" :bold t))))
+     (font-latex-italic-face ((t (:foreground "#95a99f" :italic t))))
+     (font-latex-math-face ((t (:foreground "#73c936"))))
+     (font-latex-string-face ((t (:foreground "#73c936"))))
+     (font-latex-warning-face ((t (:foreground "#f43841"))))
+     (font-latex-slide-title-face ((t (:foreground "#96a6c8"))))
+     )))
+
+(provide 'color-theme-gruber-darker)
diff --git a/dotemacs/.gitignore b/dotemacs/.gitignore
new file mode 100644
index 0000000..c531d98
--- /dev/null
+++ b/dotemacs/.gitignore
@@ -0,0 +1 @@
+*.elc