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 3eafdea7e23b2f526bab465fd2920d35336bde57..68795f0a6f75534ce752569871f3717e6b259000 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)))
@@ -119,6 +122,9 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
+;; session
+(require-if-present 'session)
+
 ;; flyspell
 (require-if-present 'flyspell)
 
@@ -144,7 +150,8 @@
       (mapcar (lambda (mode)
                 (add-to-list 'ac-modes mode))
               '(autoconf-mode
-                erlang-mode))
+                erlang-mode
+                sql-mode))
       (setq ac-modes (remove 'css-mode ac-modes))
       (add-hook 'erlang-mode-hook
                 (lambda ()
@@ -192,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")
@@ -337,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,7 +457,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))
@@ -491,6 +503,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")