Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 75b0e620679143115c956db1b4696976d032076e..e2daa01a3bf4462f0d51739df6c9783f44504f90 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -263,6 +263,10 @@
 (setq cperl-indent-level 4)
 (setq cperl-indent-parens-as-block t)
 
+;; Erlang
+(add-to-list 'load-path "/usr/pkg/lib/erlang/lib/tools-2.6/emacs")
+(require-if-present 'erlang-start)
+
 ;; SKK
 (require 'skk-autoloads)
 (global-set-key "\C-x\C-j" 'skk-mode)

diff --git a/dot-files/_fluxbox/keys b/dot-files/_fluxbox/keys
index 58499fd9394b8815a298f74966cf295eea21ba93..436864949161e537330967499196ddfd09c41561 100644 (file)
--- a/dot-files/_fluxbox/keys
+++ b/dot-files/_fluxbox/keys
@@ -1,3 +1,18 @@
+!mouse actions added by fluxbox-update_configs
+OnTitlebar Mouse2 :StartTabbing
+
+!mouse actions added by fluxbox-update_configs
+OnTitlebar Double Mouse1 :Shade
+OnTitlebar Mouse3 :WindowMenu
+
+!mouse actions added by fluxbox-update_configs
+OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
+OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing BottomRight}
+
+!mouse actions added by fluxbox-update_configs
+OnToolbar Mouse4 :NextWorkspace
+OnToolbar Mouse5 :PrevWorkspace
+
 OnDesktop Mouse1 :HideMenus
 OnDesktop Mouse2 :WorkspaceMenu
 OnDesktop Mouse3 :RootMenu
@@ -23,4 +38,4 @@ Mod1 F11 :Workspace 11
 Mod1 F12 :Workspace 12
 
 Mod1 Control bracketleft :PrevTab
-Mod1 Control bracketright :NextTab
\ No newline at end of file
+Mod1 Control bracketright :NextTab

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index ea510ea9cec975c45503af2bd265d6630b055edc..b45ff801e3809909041dcdeb7cd12b5b7f2b9df7 100644 (file)
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -11,5 +11,5 @@ username = PHO <pho@cielonegro.org>
 hgext.mq =
 hgext.fetch =
 hgext.graphlog =
-pager=
+#pager=
 color=

diff --git a/dot-files/_screenrc b/dot-files/_screenrc
index 573e24a083a49f38bc16b3e7ada96ee48a0f5b37..a2a1ea3a546fc2561023cfc4d2d69d5fcd62170f 100644 (file)
--- a/dot-files/_screenrc
+++ b/dot-files/_screenrc
@@ -5,6 +5,6 @@ defscrollback 50000
 defutf8 on
 defflow off
 
-shelltitle '% |zsh'
+#shelltitle '% |zsh'
 
 hardstatus alwayslastline "[%02c] %`%-w%{=b rw}%n %t%{-}%+w"

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 6392b2614bf962acfd805ed1d9b01fb9a627eca9..b01a0b99c2a63cff1c6fe6982f39228465f9338d 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -60,11 +60,20 @@ _prompt_base='%B[%n@%m] %{%(?.$fg[green].$fg[red])%}%#%{$reset_color%}%b '
 if ( _we_are_in_gnu_screen ); then
     # Magic escape sequence for GNU Screen to update their titles
     # dynamically by grabbing prompt line.
-    PROMPT=$'%{\ek\e\\%}'$_prompt_base
+    #PROMPT=$'%{\ek\e\\%}'$_prompt_base
+
+    PROMPT=$'%{\ek_\e\\%}'$_prompt_base
 else
     PROMPT=$_prompt_base
 fi
 
+function preexec() {
+    if ( _we_are_in_gnu_screen ); then
+        local cmd=${1[(wr)^(*=*|sudo|nice|-*|[0-9]*)]}
+        printf "\ek$cmd\e\\"
+    fi
+}
+
 RPROMPT='%U%D{%m/%d}%u %U%D{%T}%u %U%~%u'
 
 HISTFILE="$HOME/.zhistory"