X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=a488ab28b332a23c62cc295c52a3ffa513987230;hb=95d6b5a02809e271c82a002b728ed785115167f6;hp=08bda2a45dd96e539e1d21f7a415efadb31be527;hpb=b3af9d74efc6b1d42ada2c8373f6775876021753;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 08bda2a..a488ab2 100644
--- 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,9 +122,15 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
+;; session
+(require-if-present 'session)
+
 ;; flyspell
 (require-if-present 'flyspell)
 
+;; ditz
+(require-if-present 'ditz)
+
 ;; jaspace
 (require-if-present 'jaspace)
 
@@ -141,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 ()
@@ -334,6 +344,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)
@@ -371,17 +382,27 @@
 (defun memo ()
   (interactive)
   (add-change-log-entry nil (expand-file-name "~/sync/memo.txt")))
-(define-key ctl-x-map "M" #'memo)
+(define-key ctl-x-map "MM" #'memo)
 
 (defun depression ()
   (interactive)
   (add-change-log-entry nil (expand-file-name "~/sync/depression.txt")))
-(define-key ctl-x-map "P" #'depression)
+(define-key ctl-x-map "MD" #'depression)
 
 (defun plant ()
   (interactive)
   (add-change-log-entry nil (expand-file-name "~/sync/plant.txt")))
-(define-key ctl-x-map "G" #'plant)
+(define-key ctl-x-map "MP" #'plant)
+
+(defun robinson ()
+  (interactive)
+  (elscreen-create)
+  (find-file (expand-file-name "~/sync/good-things.txt"))
+  (split-window-horizontally)
+  (next-window)
+  (find-file (expand-file-name "~/sync/bad-things.txt"))
+  (next-window))
+(define-key ctl-x-map "MR" #'robinson)
 
 ;; Emacs Calc
 (add-hook 'calc-start-hook
@@ -428,6 +449,7 @@
  '(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))))
+ '(ditz-find-issue-directory-automatically-flag t)
  '(ecb-add-path-for-not-matching-files (quote (t)))
  '(ecb-help-info-path "/sw/share/info/ecb.info")
  '(ecb-layout-name "left14")
@@ -477,6 +499,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")
@@ -502,4 +525,7 @@
   ;; If there is more than one, they won't work right.
  '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t))))
  '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t))))
+ '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold))))
+ '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold))))
+ '(navi2ch-bm-updated-unread-face ((t (:foreground "DarkSeaGreen3" :weight bold))))
  '(which-func-face ((t (:background "black" :foreground "dark orange")))))