diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2016-12-26 00:07:06 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-12-26 00:07:06 +1300 |
| commit | bad56daac822acf72a900ba23c83d7b5f7365341 (patch) | |
| tree | d0e5a2e05df721757d035e58a9b42d1fbf95ca88 | |
| parent | Merge branch 'master' into openbsd (diff) | |
| parent | Ignore stderr from manpath(1) check (diff) | |
| download | dotfiles-bad56daac822acf72a900ba23c83d7b5f7365341.tar.gz dotfiles-bad56daac822acf72a900ba23c83d7b5f7365341.zip | |
Merge branch 'master' into port/bsd/openbsd
| -rw-r--r-- | bash/bash_completion.d/man.bash | 2 | ||||
| -rw-r--r-- | sh/shrc.d/ed.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bash/bash_completion.d/man.bash b/bash/bash_completion.d/man.bash index efc93153..f779d203 100644 --- a/bash/bash_completion.d/man.bash +++ b/bash/bash_completion.d/man.bash @@ -2,7 +2,7 @@ _man() { # Don't even bother if we don't have manpath(1) - hash manpath || return 1 + hash manpath 2>/dev/null || return 1 # Snarf the word local word diff --git a/sh/shrc.d/ed.sh b/sh/shrc.d/ed.sh index 6e5ecd3b..d7d3fa2f 100644 --- a/sh/shrc.d/ed.sh +++ b/sh/shrc.d/ed.sh @@ -17,7 +17,7 @@ ed() { # Run in rlwrap(1) if available set -- ed "$@" command -v rlwrap >/dev/null 2>&1 && - set -- rlwrap "$@" + set -- rlwrap --history-filename=/dev/null "$@" # Run determined command command "$@" |