diff --git a/fg42 b/fg42 index c366303..b4b7bf8 100755 --- a/fg42 +++ b/fg42 @@ -1,7 +1,7 @@ #! /bin/sh #export FG42_HOME=--PATH-- -export FG42_HOME=`pwd` +export FG42_HOME=$HOME/src/FG42/FG42 #emacs -Q --no-splash --name FG42 --title FG42 -q -l --PATH--/fg42-config.el "$@" emacs --name FG42 -Q -q --no-splash --title FG42 -l $FG42_HOME/fg42-config.el "$@" diff --git a/fg42-config.el b/fg42-config.el index f588c2f..7c7e33b 100644 --- a/fg42-config.el +++ b/fg42-config.el @@ -10,6 +10,8 @@ 'development 'web 'editor-theme + 'javascript + 'php 'ruby) ;; Disable abilities which we do not want to load diff --git a/lib/extensions/javascript/init.el b/lib/extensions/javascript/init.el index fbde01a..2a548cc 100644 --- a/lib/extensions/javascript/init.el +++ b/lib/extensions/javascript/init.el @@ -9,12 +9,14 @@ "Gives FG42 the ability to edit javascript." (autoload 'js2-mode "js2-mode" "Javascript mode") + (autoload 'tern-mode "tern.el" nil t) (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) (add-to-list 'auto-mode-alist '("\\.jsx\\'" . js2-mode)) (add-to-list 'auto-mode-alist '("\\.json\\'" . js2-mode)) (add-hook 'js-mode-hook 'js2-minor-mode) + (add-hook 'js-mode-hook (lambda () (tern-mode t))) (add-to-list 'company-backends 'company-tern) (setq js2-highlight-level 3) @@ -24,4 +26,4 @@ -(provide 'extensions/web/init) +(provide 'extensions/javascript/init) diff --git a/lib/themes/color-theme-monokai.el b/lib/themes/color-theme-monokai.el index 35426be..208baa2 100644 --- a/lib/themes/color-theme-monokai.el +++ b/lib/themes/color-theme-monokai.el @@ -19,7 +19,7 @@ ;; Edited by lsameer -;(require 'color-theme) +(require 'color) (defun themes/color-theme-monokai () "Monokai color theme for Emacs by Operator. @@ -89,7 +89,18 @@ Based on the TextMate theme Monokai" (font-latex-string-face ((t (:foreground "#77507b")))) ; plum (font-latex-warning-face ((t (:foreground "#cc0000")))) ; dark scarlet red (font-latex-slide-title-face ((t (:foreground "#c4a000")))) ; dark butter - ))) + )) + + (let ((bg (face-attribute 'default :background))) + (custom-set-faces + `(company-tooltip ((t (:inherit default :background ,(color-lighten-name bg 5))))) + `(company-scrollbar-bg ((t (:background ,(color-lighten-name bg 10))))) + `(company-scrollbar-fg ((t (:background ,(color-lighten-name bg 5))))) + `(company-tooltip-selection ((t (:inherit font-lock-function-name-face :background ,(color-lighten-name bg 10))))) + `(company-tooltip-common ((t (:inherit font-lock-constant-face))))))) + + + (set-face-attribute 'fringe nil :background "#272822")