X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.bashrc;h=6a4dec4d9e3f80c01631a4adb58fd6216bf33585;hb=05d0df98aaee581f6661372d78fa3a4c92ba6202;hp=4f3d23ee8c68c32a1e80a900534d17b4dc7c31f0;hpb=e8e2e9e16b950a1f3ac92a5417dcaaf5ea331d94;p=dotfiles.git

diff --git a/.bashrc b/.bashrc
index 4f3d23e..6a4dec4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -25,8 +25,11 @@ esac
 
 . "$HOME"/.shellrc
 
-# append to the history file, don't overwrite it
-shopt -s histappend
+if [ "$HISTFILE" = "$HOME/.bash_history" ]; then
+    # This is the default value set by interactive bash
+    # when the global value was unset. Unset it here too.
+    unset HISTFILE
+fi
 
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
@@ -36,6 +39,9 @@ shopt -s checkwinsize
 # match all files and zero or more directories and subdirectories.
 #shopt -s globstar
 
+# append to the history file, don't overwrite it
+shopt -s histappend
+
 [ "`type -t ls`" = alias ] && unalias ls
 [ "`type -t ll`" = alias ] && unalias ll
 
@@ -112,7 +118,7 @@ delegate_completion() {
     programs="$@"
     eval "_${prog}_completion_loader() {
         _completion_loader $prog
-        if [ x"$DELEGARE_NOSPACE" = x1 ]; then
+        if [ x"$DELEGATE_NOSPACE" = x1 ]; then
             complete -o nospace -F _$prog $programs
         else
             complete -F _$prog $programs
@@ -126,7 +132,7 @@ delegate_completion() {
 delegate_completion make m
 delegate_completion ping p
 delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10
-DELEGARE_NOSPACE=1 delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2
+DELEGATE_NOSPACE=1 delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2
 delegate_completion ssh s
 delegate_completion wget wget-m wget-wrapper ww
 
@@ -295,3 +301,22 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
 
     complete -F _git_open_remote git-open-remote
 fi
+
+
+if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&1; then
+    # From https://stackoverflow.com/a/18839557
+
+    copy_function() {
+        test -n "$(declare -f "$1")" || return
+        eval "${_/$1/$2}"
+    }
+
+    rename_function() {
+        copy_function "$@" || return
+        unset -f "$1"
+    }
+
+    rename_function X _non_bash_X
+
+    X() { history -a; _non_bash_X; history -r; }
+fi