diff options
| -rw-r--r-- | .config/git/config | 6 | ||||
| -rw-r--r-- | .emacs.d/eshell/alias | 7 | ||||
| -rw-r--r-- | .emacs.d/eshell/profile | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/.config/git/config b/.config/git/config index a2019994..67ce2700 100644 --- a/.config/git/config +++ b/.config/git/config @@ -18,12 +18,6 @@ gitaddtoannex = false skipunknown = true -[color] - # So that we get colour in Eshell. When we can assume git 2.31 might - # want to have GIT_CONFIG_KEY_1=color.ui and GIT_CONFIG_VALUE_1=always - # in ~/.emacs.d/eshell/profile instead. - ui = always - [core] pager = hooksPath = ~/src/dotfiles/hooks/git/hooksPath diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias index d4d552bd..dacbdef3 100644 --- a/.emacs.d/eshell/alias +++ b/.emacs.d/eshell/alias @@ -16,3 +16,10 @@ alias pdfwords pdftotext "$1" - | wc -w alias tail-dak { cd /ssh:ftp-master.debian.org:/srv/ftp-master.debian.org/log && tail -f current } alias tail-queued { cd /ssh:ssh.upload.debian.org:/srv/upload.debian.org/queued/run && tail -f log } alias package-plan-unpack ~/src/dotfiles/scripts/debian/package-plan-unpack "$1"; cd "/tmp/$1" + +# Override ~/.config/git/config and ~/.profile whose settings imply colours +# only when output is a tty, which it isn't with Eshell. +# We could just export the environment variables, but this should restrict the +# colouration to commands run interactively, not others buried in scripts. +alias git git -c color.ui=always $* +alias quilt QUILT_DIFF_ARGS="-p ab --color=always" QUILT_PUSH_ARGS="--refresh --color=always" quilt $* diff --git a/.emacs.d/eshell/profile b/.emacs.d/eshell/profile index d0895b3a..dccfc2b2 100644 --- a/.emacs.d/eshell/profile +++ b/.emacs.d/eshell/profile @@ -6,7 +6,3 @@ export VISUAL="$EDITOR" # debconf will fall back to this frontend but emit a warning; set it ourselves # to avoid that warning export DEBIAN_FRONTEND=readline - -# --color=auto -> --color=always -export QUILT_DIFF_ARGS="-p ab --color=always" -export QUILT_PUSH_ARGS="--refresh --color=always" |