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 6f37d1c56c47583090506f128981f4f56c68ee30..a1d8165e57725e84d2249f5d4d71a4aa870eef52 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 ()
@@ -491,9 +498,11 @@
  '(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")
+ '(tramp-default-method "sshx")
  '(w3m-bookmark-file-coding-system (quote utf-8))
  '(w3m-coding-system (quote utf-8))
  '(w3m-coding-system-priority-list (quote (utf-8)))