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 6e04631a40e53d8380ebfbea50a48159e5a470e3..927424c236e613fef9798b84616f585da4faa85a 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -28,11 +28,17 @@
 (global-font-lock-mode t)
 
 (auto-compression-mode t)
+(which-function-mode t)
 (setq visible-bell t)
 (setq ring-bell-function (lambda ()))
-(windmove-default-keybindings)
 
-(server-start)
+(require 'server)
+(if (server-running-p)
+    (message "Warning: server %S is already running." server-name)
+  (server-start))
+
+;; windmove
+(windmove-default-keybindings)
 
 ;; Host specific configuration ------------------------------------------------
 (let ((host (system-name)))
@@ -119,6 +125,9 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
+;; session
+(require-if-present 'session)
+
 ;; flyspell
 (require-if-present 'flyspell)
 
@@ -193,7 +202,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")
@@ -242,6 +255,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)
@@ -298,7 +312,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)
@@ -338,6 +351,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)
@@ -439,6 +453,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))))
@@ -485,6 +500,7 @@
  '(newsticker-url-list-defaults (quote (("slashdot" "http://slashdot.org/index.rss" nil 3600))))
  '(nxml-auto-insert-xml-declaration-flag t)
  '(nxml-slash-auto-complete-flag t)
+ '(org-replace-disputed-keys t)
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(riece-layout-alist (quote (("middle-right" riece-configure-windows right middle) ("middle-left" riece-configure-windows left middle) ("top-right" riece-configure-windows right top) ("top-left" riece-configure-windows left top) ("bottom-right" riece-configure-windows right bottom) ("bottom-left" riece-configure-windows left bottom) ("top" riece-configure-windows-top) ("spiral" riece-configure-windows-spiral) ("default" . "middle-right"))))
@@ -492,6 +508,7 @@
  '(rng-schema-locating-files (quote ("schemas.xml" "/sw/share/schema/schemas.xml" "~/share/nxml/schemas.xml")))
  '(rst-level-face-base-light 50)
  '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo"))))
+ '(session-use-package t nil (session))
  '(tramp-auto-save-directory "/tmp/tramp-auto-save")
  '(tramp-completion-reread-directory-timeout 2)
  '(tramp-default-host "localhost")
@@ -509,6 +526,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.