sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only add existing paths to load paths, tweaked colours, js2-mode, cc-mode cleanups.

Browse source
This commit is contained in:
Sami Samhuri 2010-06-24 17:17:58 -07:00
parent c45681b3c2
commit 541e3cb739
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
emacs
View file

@ -114,7 +114,6 @@
(c-cleanup-list . (brace-else-brace (c-cleanup-list . (brace-else-brace
brace-elseif-brace brace-elseif-brace
brace-catch-brace brace-catch-brace
empty-defun-braces
defun-close-semi))) defun-close-semi)))
"how sjs likes his C") "how sjs likes his C")
(c-add-style "sjs" my-c-style) (c-add-style "sjs" my-c-style)
@ -271,10 +270,11 @@
;; erlang ;; erlang
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(setq load-path (cons "/opt/local/lib/erlang/lib/tools-2.6.5/emacs" load-path)) (when (file-exists-p "/opt/local/lib/erlang")
(setq erlang-root-dir "/opt/local/lib/erlang/otp") (setq load-path (cons "/opt/local/lib/erlang/lib/tools-2.6.5/emacs" load-path))
(setq exec-path (cons "/opt/local/lib/erlang/bin" exec-path)) (setq erlang-root-dir "/opt/local/lib/erlang/otp")
(require 'erlang-start) (setq exec-path (cons "/opt/local/lib/erlang/bin" exec-path))
(require 'erlang-start))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -302,13 +302,14 @@
(setq inferior-lisp-program "/usr/bin/env sbcl") (setq inferior-lisp-program "/usr/bin/env sbcl")
;; setup slime ;; setup slime
(add-to-list 'load-path "~/.slime") (when (file-exists-p "~/.slime")
(require 'slime) (add-to-list 'load-path "~/.slime")
(slime-setup) (require 'slime)
(add-hook 'lisp-mode-hook (lambda () (slime-mode t))) (slime-setup)
(add-hook 'scheme-mode-hook (lambda () (slime-mode t))) (add-hook 'lisp-mode-hook (lambda () (slime-mode t)))
(add-hook 'inferior-lisp-mode-hook (lambda () (inferior-slime-mode t))) (add-hook 'scheme-mode-hook (lambda () (slime-mode t)))
(add-hook 'inferior-scheme-mode-hook (lambda () (inferior-slime-mode t))) (add-hook 'inferior-lisp-mode-hook (lambda () (inferior-slime-mode t)))
(add-hook 'inferior-scheme-mode-hook (lambda () (inferior-slime-mode t))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -563,6 +564,7 @@ PAIRS, defaults are: (), [], {}, <>."
'(js2-highlight-level 3) '(js2-highlight-level 3)
'(js2-mode-escape-quotes nil) '(js2-mode-escape-quotes nil)
'(js2-strict-inconsistent-return-warning nil) '(js2-strict-inconsistent-return-warning nil)
'(js2-strict-missing-semi-warning nil)
'(minimap-always-recenter nil) '(minimap-always-recenter nil)
'(minimap-display-semantic-overlays t) '(minimap-display-semantic-overlays t)
'(mojo-build-directory "~/Projects/brighthouse/webOS/build") '(mojo-build-directory "~/Projects/brighthouse/webOS/build")
@ -571,6 +573,7 @@ PAIRS, defaults are: (), [], {}, <>."
'(remote-shell-program "/usr/bin/ssh") '(remote-shell-program "/usr/bin/ssh")
'(save-place t nil (saveplace)) '(save-place t nil (saveplace))
'(scroll-bar-mode nil) '(scroll-bar-mode nil)
'(shell-file-name "/bin/zsh")
'(show-paren-mode t nil (paren)) '(show-paren-mode t nil (paren))
'(tool-bar-mode nil)) '(tool-bar-mode nil))

2
emacs.d/color-theme/color-theme.el
View file

@ -4610,7 +4610,7 @@ Wheat on black. Includes faces for font-lock, gnus, paren."
(interactive) (interactive)
(color-theme-install (color-theme-install
'(color-theme-taylor '(color-theme-taylor
((background-color . "#111") ((background-color . "#191919")
(background-mode . dark) (background-mode . dark)
(border-color . "black") (border-color . "black")
(cursor-color . "red") (cursor-color . "red")