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 33ea9b49aef842ddc33050f654172d348ade633e..f3f4c915d05d8b7dc2f2c3992e64bdd431ef8feb 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -32,7 +32,10 @@
 (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))
 
 ;; Host specific configuration ------------------------------------------------
 (let ((host (system-name)))
@@ -196,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")
@@ -245,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)
@@ -341,6 +349,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)
@@ -449,7 +458,7 @@
  '(ecb-add-path-for-not-matching-files (quote (t)))
  '(ecb-help-info-path "/sw/share/info/ecb.info")
  '(ecb-layout-name "left14")
- '(ecb-options-version "2.32")
+ '(ecb-options-version "2.40")
  '(ecb-show-sources-in-directories-buffer (quote always))
  '(ecb-tip-of-the-day nil)
  '(ecb-tree-buffer-style (quote ascii-guides))