Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index e8508e6620220a91c1a19bd937ec846d4de348f1..c05e74082f6a545c6428648f2b0cab55b2456450 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -141,6 +141,11 @@
       (color-theme-initialize)
       (color-theme-subtle-hacker)))
 
+;; multi-term
+(autoload 'multi-term "multi-term"
+  "Create new term buffer.
+Will prompt you shell name when you type `C-u' before this command." t)
+
 ;; auto-complete
 (require-if-present 'auto-complete-config)
 (if (featurep 'auto-complete-config)

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index d800cc42c2d8694bd4d9918ac35178f1d7aa2961..45ac9aff1c98f72aa3f9c0b4a89faf46d19bcc18 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -60,6 +60,10 @@ function _we_are_in_ssh_session () {
     [[ -n "$SSH_CONNECTION" ]]
 }
 
+function _we_are_in_emacs () {
+    [[ -n "$INSIDE_EMACS" ]]
+}
+
 _prompt_base='%B[%n@%m] %{%(?.$fg[green].$fg[red])%}%#%{$reset_color%}%b '
 if ( _we_are_in_gnu_screen ); then
     # GNU Screen has a capability to set its window title by "ESC k
@@ -280,16 +284,17 @@ autoload -U compinit
 compinit
 # End of lines added by compinstall
 
-if ( _we_are_in_gnu_screen ); then
+if _we_are_in_gnu_screen; then
     # When we are in a GNU Screen session...
 
-    if ( _we_are_in_ssh_session ); then
+    if _we_are_in_ssh_session; then
         # Propagate remote session's bells to the local one.
         screen -X vbell off
     fi
 else
-    if [ -e ".motd" ]; then
-        cat ".motd"
+    if _we_are_in_emacs; then
+        # Without this, Emacs' term mode has trouble with backspaces.
+        export TERM=vt100
     fi
 
     # Run "fortune" if we aren't in a GNU Screen session.