Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index a1d8165e57725e84d2249f5d4d71a4aa870eef52..bb2ed48ad6479bf165a137da4ddd1b3e91c9eba0 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -199,7 +199,11 @@
                          (add-to-list 'riece-addons 'riece-keyword)
                          (add-to-list 'riece-addons 'riece-ctlseq)))
 
-;; ecb
+;; CEDET
+(add-to-list 'load-path "/usr/pkg/share/emacs/cedet/common")
+(require-if-present 'cedet)
+
+;; ECB
 (require-if-present 'ecb-autoloads)
 (let* ((hosts '(("netbsd." .
                  (("~/sandbox/yxmimeproc" "yxmimeproc")
@@ -248,6 +252,7 @@
 ;; javascript
 (autoload 'js2-mode "js2" nil t)
 (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
+(add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode))
 
 ;; ido
 (require 'ido)
@@ -304,7 +309,6 @@
  (add-hook 'haskell-mode-hook
    (lambda () (set-input-method "haskell-unicode")))
 
-
 ;; Hoogle
 (autoload 'hoogle-lookup "hoogle" "Hoogle" t)
 (global-set-key (kbd "C-c h") 'hoogle-lookup)
@@ -344,6 +348,7 @@
 
 ;; SKK
 (require 'skk-autoloads)
+(require 'skk-study)
 (global-set-key "\C-x\C-j" 'skk-mode)
 (global-set-key "\C-xj" 'skk-auto-fill-mode)
 (global-set-key "\C-xt" 'skk-tutorial)
@@ -445,6 +450,7 @@
  '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716")
  '(cleite:auto-refresh-interval nil)
  '(cleite:measure-srpc-call-time t)
+ '(compilation-scroll-output (quote first-error))
  '(completion-ignored-extensions (quote (".svn/" "CVS/" ".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".dvi" ".fmt" ".tfm" ".pdf" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".hi")))
  '(cperl-merge-trailing-else nil)
  '(default-frame-alist (quote ((tool-bar-lines . 0) (menu-bar-lines . 1) (width . 80) (height . 25) (right-fringe) (left-fringe))))
@@ -516,6 +522,7 @@
  '(w3m-output-coding-system (quote utf-8))
  '(w3m-terminal-coding-system (quote utf-8))
  '(w3m-use-cookies t)
+ '(windmove-wrap-around t)
  '(x-select-enable-clipboard t))
 (custom-set-faces
   ;; custom-set-faces was added by Custom.