run-emacscleint

Makefile

@@ -22,6 +22,7 @@ BIN_FILES =					\
 	bin/clangd-chooser			\
 	bin/histogram				\
 	bin/json-pp				\
+	bin/run-emacsclient			\
 	bin/xkb-layout				\
 	bin/xml-pp
 

bashrc

@@ -72,11 +72,7 @@ export GTK_OVERLAY_SCROLLING=0
 # https://ubuntuforums.org/showthread.php?t=2390362
 export QT_AUTO_SCREEN_SCALE_FACTOR=0
 
-if [ "x$EMACS_SOCKET_NAME" != "x" ]; then
-    alias e="emacsclient -r -n --socket-name $EMACS_SOCKET_NAME"
-else
-    alias e="emacsclient -r -n"
-fi
+alias e="run-emacsclient"
 
 if [ -f ~/.bashrc_local ]; then
     . ~/.bashrc_local

bin/run-emacsclient

@@ -0,0 +1,15 @@
+#!/bin/sh
+# -*- mode: shell-script; -*-
+
+EMACSCLIENT_VERSION=$(emacsclient --version | grep -oE '[0-9]+' | head -1)
+EMACSCLIENT_ARGS="-n"
+
+if [ "x$EMACS_SOCKET_NAME" != "x" ]; then
+   EMACSCLIENT_ARGS="$EMACSCLIENT_ARGS --socket-name $EMACS_SOCKET_NAME"
+fi
+
+if [ "$EMACSCLIENT_VERSION" -ge "28" ]; then
+    EMACSCLIENT_ARGS="$EMACSCLIENT_ARGS -r"
+fi
+
+exec emacsclient $EMACSCLIENT_ARGS "$@"