diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-01-02 23:33:38 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-01-02 23:33:38 +1300 |
commit | 499de58a83f5a0492373728124248103a63600e0 (patch) | |
tree | 21929506193865aa29d976be6037f32480637000 | |
parent | Merge branch 'release/v4.5.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-499de58a83f5a0492373728124248103a63600e0.tar.gz dotfiles-499de58a83f5a0492373728124248103a63600e0.zip |
Merge branch 'hotfix/v4.5.1'v4.5.1
* hotfix/v4.5.1:
Bump VERSION
Use short switches for emacs server pgrep
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | sh/profile.d/visual.sh | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v4.5.0 -Wed Jan 2 10:29:09 UTC 2019 +tejr dotfiles v4.5.1 +Wed Jan 2 10:33:20 UTC 2019 diff --git a/sh/profile.d/visual.sh b/sh/profile.d/visual.sh index 359bf13a..899437af 100644 --- a/sh/profile.d/visual.sh +++ b/sh/profile.d/visual.sh @@ -5,8 +5,7 @@ if command -v emacs >/dev/null 2>&1 && # Use or start a GNU Emacs client, if possible if command -v pgrep >/dev/null 2>&1 && - pgrep --exact --full --euid="$USER" \ - 'emacs --daemon' >/dev/null || + pgrep -fxu "$USER" 'emacs --daemon' >/dev/null || emacs --daemon >/dev/null ; then VISUAL=emacsclient |