Permalink
Browse files

Tweaks to skeletons and added icicles into .emacs

  • Loading branch information...
1 parent e5466a7 commit 8139b7345c34ab01d941bd155a4296b4ba46a838 @srstrong committed Jan 13, 2014
Showing with 119 additions and 139 deletions.
  1. +18 −51 dot_emacs
  2. +101 −88 erlang/erlang-skels.el
View
@@ -3,6 +3,7 @@
(show-paren-mode 1)
(setq confirm-nonexistent-file-or-buffer 1)
+;;(setq ns-right-option-modifier 'super)
(defun set-frame-size-according-to-resolution ()
(interactive)
@@ -30,7 +31,11 @@
(add-to-list 'load-path "~/src/emacs")
(add-to-list 'load-path "~/src/emacs/color-theme")
(add-to-list 'load-path "~/src/emacs/expand-region.el")
+(add-to-list 'load-path "~/src/emacs/icicles")
+(require 'icicles)
+(require 'fuzzy-match)
+(icy-mode 1)
(require 'handlebars-mode)
(require 'multi-term)
(require 'ace-jump-mode)
@@ -80,6 +85,7 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(ecb-options-version "2.40")
+ '(edts-man-root "~/.emacs.d/edts/doc/R16B")
'(initial-buffer-choice t)
'(safe-local-variable-values (quote ((allout-layout . t) (erlang-indent-level . 4))))
'(term-default-bg-color "#002b36")
@@ -97,7 +103,14 @@
(setq erlang-root-dir "/usr/local/lib/erlang")
(setq exec-path (cons "/usr/local/lib/erlang/bin" exec-path))
(require 'erlang-start)
-
+(setq auto-mode-alist (append auto-mode-alist
+ '(("\\.rel$" . erlang-mode)
+ ("\\.app$" . erlang-mode)
+ ("\\.appSrc$" . erlang-mode)
+ ("\\.app.src$" . erlang-mode)
+ ("\\.hrl$" . erlang-mode)
+ ("\\.erl$" . erlang-mode)
+ ("\\.yrl$" . erlang-mode))))
;; Wrangler
;;(add-to-list 'load-path "/usr/local/share/wrangler/elisp")
@@ -178,10 +191,10 @@
(global-set-key (kbd "M-1") "|")
(global-set-key (kbd "M-2") "@")
(global-set-key (kbd "M-3") "#")
-(global-set-key (kbd "M-") "\\")
-(global-set-key (kbd "M-") "}")
+(global-set-key (kbd "M-º") "\\")
+(global-set-key (kbd "M-ç") "}")
(global-set-key (kbd "M-+") "]")
-(global-set-key (kbd "M-") "~")
+(global-set-key (kbd "M-ñ") "~")
;; Anything
;; (add-to-list 'load-path "~/src/anything-config")
@@ -200,50 +213,4 @@
(add-to-list 'load-path "~/src/edts")
(require 'edts-start)
-(edts-man-set-root "~/src/erlang-man/man")
-
-;;(setq edts-projects
-;; '(
-;; ( ;; id3as_media (in Arqiva)
-;; (root . "~/Projects/Arqiva/deps/id3as_media")
-;; (lib-dirs . ("../../deps"))
-;; (node-sname . "arqiva_id3as_media")
-;; )
-;; ( ;; Arqiva
-;; (name . "arqiva")
-;; (root . "~/Projects/Arqiva")
-;; (lib-dirs . ("deps" "apps"))
-;; )
-;;
-;; ( ;; id3as_media (in VEE)
-;; (root . "~/Projects/VEE/deps/id3as_media")
-;; (lib-dirs . ("../../deps"))
-;; (node-sname . "vee_id3as_media")
-;; )
-;; ( ;; VEE
-;; (name . "vee")
-;; (root . "~/Projects/VEE")
-;; (lib-dirs . ("deps" "apps"))
-;; )
-;;
-;; ( ;; Calendapp
-;; (name . "calendapp")
-;; (root . "~/Projects/Calendapp")
-;; (lib-dirs . ("deps" "apps"))
-;; )
-;;
-;; ( ;; id3as_media (in AEE)
-;; (root . "~/Projects/Reuters-Call-Capture/deps/id3as_media")
-;; (lib-dirs . ("../../deps"))
-;; (node-sname . "aee_id3as_media")
-;; )
-;;;; ( ;; AEE VCI Audio Backup
-;;;; (root . "~/Projects/Reuters-Call-Capture/apps/vci_audio_backup")
-;;;; (node-sname . "vci_audio_backup_emacs")
-;;;; (lib-dirs . ("../../deps" "../../apps"))
-;;;; )
-;; ( ;; AEE
-;; (root . "~/Projects/Reuters-Call-Capture")
-;; (lib-dirs . ("deps" "apps"))
-;; )
-;; ))
+(setq-default indent-tabs-mode nil)
Oops, something went wrong.

0 comments on commit 8139b73

Please sign in to comment.