Merge branch 'master' of github.com:tobytripp/emacs.d

Conflicts:
	custom.el
	init.el
	lib/color-theme-pastels.el
	lib/toby-mode.el

.gitignore

@@ -7,4 +7,8 @@ abbref_defs
 .smex-items
 places
 url/*
-*.elc
+*.elc
+/bookmarks
+history
+/.emacs.keyfreq
+/.recentf

custom.el

@@ -3,21 +3,24 @@
  ;; 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.
+ '(ansi-color-names-vector [solarized-bg red green yellow blue magenta cyan solarized-fg])
  '(aquamacs-additional-fontsets nil t)
  '(aquamacs-customization-version-id 211 t)
  '(aquamacs-tool-bar-user-customization nil t)
  '(coffee-args-compile (quote ("-c" "-o js")))
  '(coffee-tab-width 2)
  '(compilation-ask-about-save nil)
  '(custom-enabled-themes (quote (tsdh-light)))
- '(custom-safe-themes (quote ("501caa208affa1145ccbb4b74b6cd66c3091e41c5bb66c677feda9def5eab19c" default)))
+ '(custom-safe-themes (quote ("180be8ecbfeebff1032191e90095149e58b0eeff86ea5a4f8dff4bf8b5de86ae" "72cc9ae08503b8e977801c6d6ec17043b55313cda34bcf0e6921f2f04cf2da56" "d2622a2a2966905a5237b54f35996ca6fda2f79a9253d44793cfe31079e3c92b" "501caa208affa1145ccbb4b74b6cd66c3091e41c5bb66c677feda9def5eab19c" default)))
  '(default-frame-alist (quote ((vertical-scroll-bars) (cursor-type . box) (internal-border-width . 0) (left-fringe . 1) (right-fringe) (fringe) (background-color . "#211E1E") (background-mode . dark) (background-toolbar-color . "#cf3ccf3ccf3c") (border-color . "Grey") (bottom-toolbar-shadow-color . "#79e77df779e7") (cursor-color . "#FFFFFF") (foreground-color . "#DADADA") (mouse-color . "Grey") (top-toolbar-shadow-color . "#fffffbeeffff") (viper-saved-cursor-color-in-replace-mode . "Red3"))))
  '(erc-modules (quote (autojoin button completion fill irccontrols list match menu move-to-prompt netsplit networks noncommands readonly ring scrolltobottom smiley stamp spelling track)))
  '(erc-server "irc.freenode.net")
+ '(fci-rule-color "#073642")
+ '(flymake-allowed-file-name-masks (quote ((".+\\.lhs$" flymake-Haskell-init flymake-simple-java-cleanup) (".+\\.hs$" flymake-Haskell-init flymake-simple-java-cleanup) ("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'" flymake-simple-make-init) ("\\.xml\\'" flymake-xml-init) ("\\.html?\\'" flymake-xml-init) ("\\.cs\\'" flymake-simple-make-init) ("\\.p[ml]\\'" flymake-perl-init) ("\\.php[345]?\\'" flymake-php-init) ("\\.h\\'" flymake-master-make-header-init flymake-master-cleanup) ("\\.java\\'" flymake-simple-make-java-init flymake-simple-java-cleanup) ("[0-9]+\\.tex\\'" flymake-master-tex-init flymake-master-cleanup) ("\\.tex\\'" flymake-simple-tex-init) ("\\.idl\\'" flymake-simple-make-init))))
  '(glasses-face (quote bold))
- '(glasses-original-separator "␣")
+ '(glasses-original-separator " ")
  '(glasses-separate-parentheses-p nil)
- '(glasses-separator "⚊")
+ '(glasses-separator " ")
  '(glasses-uncapitalize-p nil)
  '(global-auto-revert-mode t)
  '(global-hl-line-mode t)
@@ -30,10 +33,11 @@
  '(js2-mirror-mode t)
  '(js2-mode-show-parse-errors nil)
  '(js2-mode-show-strict-warnings nil)
+ '(magit-process-popup-time 20)
  '(ns-alternate-modifier (quote super))
  '(ns-tool-bar-display-mode nil t)
  '(ns-tool-bar-size-mode nil t)
- '(nxhtml-autoload-web nil)
+ '(org-agenda-files (quote ("~/Dropbox/org/ib-tasks.org" "~/Dropbox/org/my-tasks.org")))
  '(revert-without-query (quote (".*")))
  '(rspec-compilation-buffer-name "*specs*")
  '(rspec-rake-command "bundle exec rake")
@@ -45,15 +49,11 @@
  '(ruby-deep-indent-paren nil)
  '(safe-local-variable-values (quote ((encoding . utf-8) (whitespace-line-column . 80) (lexical-binding . t))))
  '(visual-line-mode nil t)
+ '(warning-minimum-level :error)
  '(whitespace-style (quote (trailing tab-mark))))
 (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.
- '(column-marker-1 ((t (:background "red4"))))
- '(magit-item-highlight ((((class color) (background dark)) (:background "gray7"))))
- '(minibuffer-prompt ((t (:background "#2C2828" :foreground "wheat" :box nil :weight bold))))
- '(mumamo-background-chunk-major ((((class color) (min-colors 88) (background dark)) nil)) t)
- '(mumamo-background-chunk-submode1 ((((class color) (min-colors 88) (background dark)) (:background "gray15"))) t)
- '(paren-face ((t (:background "black" :foreground "wheat")))))
+ )

init.el

@@ -1,5 +1,5 @@
-(setq debug-on-error t)
-(setq debug-ignored-errors nil)
+;; (setq debug-on-error t)
+;; (setq debug-ignored-errors nil)
 
 (if (fboundp 'tool-bar-mode)   (tool-bar-mode -1))
 (if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
@@ -39,6 +39,7 @@
 (require 'switch-window)
 
 (global-hl-line-mode 1)
+(delete-selection-mode t)
 (put 'downcase-region 'disabled nil)
 
 (mapc (lambda (path)
@@ -48,5 +49,10 @@
 
 (require 'toby-mode)
 (toby-mode)
+(add-hook 'find-file-hook 'toby-mode)
+(add-hook 'after-change-major-mode-hook 'toby-mode)
+(put 'ido-exit-minibuffer 'disabled nil)
+(put 'upcase-region 'disabled nil)
+
 (put 'ido-exit-minibuffer 'disabled nil)
 (put 'upcase-region 'disabled nil)

keybindings.el

@@ -8,10 +8,20 @@
 (setq
   ns-command-modifier   'super       ; Apple/Command key is Meta
   ns-alternate-modifier 'meta        ; Option is the Mac Option key
-  ns-function-modifier  'hyper
+  ns-function-modifier  'super       ; or 'hyper
   ns-pop-up-frames      nil
   )
 
+(define-key input-decode-map "\e[1;5A" [C-up])
+(define-key input-decode-map "\e[1;5B" [C-down])
+(define-key input-decode-map "\e[1;5C" [C-right])
+(define-key input-decode-map "\e[1;5D" [C-left])
+
+(define-key function-key-map "\M-[ a"  [C-up])
+(define-key function-key-map "\M-[ b"  [C-down])
+(define-key function-key-map "\M-[ c"  [C-right])
+(define-key function-key-map "\M-[ d"  [C-left])
+
 ;; Escape is C-g
 (global-set-key [escape] 'keyboard-quit)
 (global-set-key (kbd "s-x") 'smex)   ; s-x == M-x