summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-10-29 11:01:58 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-10-29 21:53:28 -0700
commita21b3639920b25dee4da52d39fe35a7c619f4938 (patch)
tree7cf4c873fbb7202c66cba8d21038022b71f2dc2b
parentb4adeea21740d94cab6e0061aabf22c4ee151618 (diff)
downloaddotfiles-a21b3639920b25dee4da52d39fe35a7c619f4938.tar.gz
emacsclient wrapper: -sgdbmacs implies --spw/installed
-rw-r--r--.bashrc4
-rw-r--r--.config/i3/config2
-rw-r--r--.config/sway/config2
-rwxr-xr-xbin/emacsclient3
4 files changed, 7 insertions, 4 deletions
diff --git a/.bashrc b/.bashrc
index 3759e392..b7db29a2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -51,7 +51,7 @@ alias ta="tmux new-session -A -s default"
alias rax="screen -URaAx"
alias new-login-shell="exec su -l $USER" # get new UNIX group without relog
alias mrs="src-register-all && mr -m status"
-alias gdbmacs="emacsclient -tc -sgdbmacs --spw/installed"
+alias gdbmacs="emacsclient -tc -sgdbmacs"
alias b="bts --mbox show"
@@ -80,7 +80,7 @@ upenv () {
done
fi
emacsclient --spw/update-environment
- emacsclient -sgdbmacs --spw/no-start --spw/update-environment
+ emacsclient -sgdbmacs --spw/update-environment
}
# --- host-specific aliases/functions
diff --git a/.config/i3/config b/.config/i3/config
index 7c9291cd..c2f442b5 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -65,7 +65,7 @@ mode "C-i-" {
bindsym Shift+e exec emacsclient -nc --spw/installed, mode "default"
# special daemon instance for debugging primary instance & Gnus
- bindsym Mod1+e exec emacsclient -nc -sgdbmacs --spw/installed, mode "default"
+ bindsym Mod1+e exec emacsclient -nc -sgdbmacs, mode "default"
# Fresh Emacs frame and get a shell in HOME. Without this it's
# C-i e M-& which is too many keys esp. compared to C-i DEL
diff --git a/.config/sway/config b/.config/sway/config
index e258f6b5..a99d6694 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -50,7 +50,7 @@ mode "C-i-" {
bindsym Shift+e exec emacsclient -nc --spw/installed, mode "default"
# special daemon instance for debugging primary instance & Gnus
- bindsym Mod1+e exec emacsclient -nc -sgdbmacs --spw/installed, mode "default"
+ bindsym Mod1+e exec emacsclient -nc -sgdbmacs, mode "default"
# Fresh Emacs frame and get a shell in HOME. Without this it's
# C-i e M-& which is too many keys esp. compared to C-i DEL
diff --git a/bin/emacsclient b/bin/emacsclient
index 1ac1b993..752102f9 100755
--- a/bin/emacsclient
+++ b/bin/emacsclient
@@ -98,6 +98,9 @@ for arg do
esac
done
+# -sgdbmacs implies --spw/installed, as a special case.
+[ "$daemon_name" = gdbmacs ] && want_installed=true
+
devel_emacs="$HOME/src/emacs/src/emacs"
devel_emacsclient="$HOME/src/emacs/lib-src/emacsclient"