Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index f519e5d2bfeb817f68f204a041a0fc2551d2367e..aca5f405819f15799480863e3b320a72327b67db 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -103,7 +103,7 @@
 ;; mic-paren
 (require-if-present 'mic-paren)
 (if (featurep 'mic-paren)
-       (paren-activate))
+    (paren-activate))
 
 ;; elscreen
 (load "elscreen" "ElScreen" t)
@@ -119,6 +119,10 @@
       (append '(("\\.rst$" . rst-mode)
                 ("\\.rest$" . rst-mode)) auto-mode-alist))
 
+;; lua-mode
+(autoload 'lua-mode "lua-mode" "Lua editing mode." t)
+(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode) auto-mode-alist)
+
 ;; twittering-mode
 (require-if-present 'twittering-mode)
 (setq twittering-username "phonohawk")
@@ -275,6 +279,7 @@
 ;; Erlang
 (add-to-list 'load-path "/usr/pkg/lib/erlang/lib/tools-2.6/emacs")
 (require-if-present 'erlang-start)
+(setq erlang-electric-commands nil)
 
 ;; SKK
 (require 'skk-autoloads)

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 15a7d85204e7f5a97a2b1b9b4ca5a90cf5085a87..710f2590c1fcf04ef13e734d4e8df127cfdc3242 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -141,6 +141,7 @@ alias pstow="pushd /usr/local/stow"
 alias w3m="w3m -O UTF-8"
 alias w3mb="w3m -O UTF-8 -B"
 alias pkgsrc="pushd /usr/pkgsrc"
+alias man="LANG=C man"
 
 alias aria="ssh -X admin@aria.cielonegro.org"
 alias nem="ssh -X pho@nem.cielonegro.org"