aliases.sh: don't alias "emacs" if we're in an emacs shell.

diff --git a/aliases.sh b/aliases.sh
index 425eba8fd5c29169d7d8da8dcb0b86811a375906..76962bd5ea6ebb90d61bbbeb20cb55f28ecad502 100644 (file)
--- a/aliases.sh
+++ b/aliases.sh
@@ -4,12 +4,15 @@
 alias df='df --human-readable'
 alias du='du --human-readable --summarize --total *'
 
-# We set EDITOR, VISUAL, and the "emacs" alias to the no-window
-# version because it's so much faster than gtk emacs. In the rare
-# cases (like within emacs's own multi-term environment) where
-# a separate gtk window is required, /usr/bin/emacs can be used
-# instead.
-alias emacs='emacs --no-window-system'
+if [ "${TERM#eterm}" = "${TERM}" ]; then
+    # We set EDITOR, VISUAL, and the "emacs" alias to the no-window
+    # version because it's so much faster than gtk emacs. (Note: the
+    # environment variables are currently set using "eselect" in
+    # Gentoo.) The exception for "eterm" that we've made here is to
+    # avoid launching emacs-nw within emacs-nw itself; in multi-term,
+    # for example, where $TERM is "eterm-color".
+    alias emacs='emacs --no-window-system'
+fi
 
 alias ls='ls -l --color=auto --human-readable --time-style=long-iso'
 alias youtube-dl-mp3='youtube-dl --extract-audio --audio-format=mp3'