Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index bb2ed48ad6479bf165a137da4ddd1b3e91c9eba0..927424c236e613fef9798b84616f585da4faa85a 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -28,15 +28,18 @@
 (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)
 
 (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)))
   (cond ((equal host "aria.cielonegro.org")
@@ -497,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"))))