From ca0acf31ef163fd2a6bf562c9b9d6077975b41f8 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 13 Jan 2023 14:42:11 +0100
Subject: fix(emacs): make `alternate-editor` work for emacs >28
Closes #11441
---
plugins/emacs/README.md | 2 +-
plugins/emacs/emacs.plugin.zsh | 2 +-
plugins/emacs/emacsclient.sh | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'plugins')
diff --git a/plugins/emacs/README.md b/plugins/emacs/README.md
index c8e33b5ab..8ed4a1473 100644
--- a/plugins/emacs/README.md
+++ b/plugins/emacs/README.md
@@ -25,6 +25,6 @@ The plugin uses a custom launcher (which we'll call here `$EMACS_LAUNCHER`) that
| e | `emacs` | Same as emacs alias |
| te | `$EMACS_LAUNCHER -nw` | Open terminal emacsclient |
| eeval | `$EMACS_LAUNCHER --eval` | Same as `M-x eval` but from outside Emacs |
-| eframe | `emacsclient --alternate-editor "" --create-frame` | Create new X frame |
+| eframe | `emacsclient --alternate-editor="" --create-frame` | Create new X frame |
| efile | - | Print the path to the file open in the current buffer |
| ecd | - | Print the directory of the file open in the the current buffer |
diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index fede5b0c4..4747f035b 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -32,7 +32,7 @@ alias te="$EMACS_PLUGIN_LAUNCHER -nw"
# same than M-x eval but from outside Emacs.
alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
# create a new X frame
-alias eframe='emacsclient --alternate-editor "" --create-frame'
+alias eframe='emacsclient --alternate-editor="" --create-frame'
# Emacs ANSI Term tracking
if [[ -n "$INSIDE_EMACS" ]]; then
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 96893c932..172c0ae96 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -15,11 +15,11 @@ emacsfun() {
# Only create another X frame if there isn't one present
if [ -z "$frames" -o "$frames" = nil ]; then
- emacsclient --alternate-editor "" --create-frame "$@"
+ emacsclient --alternate-editor="" --create-frame "$@"
return $?
fi
- emacsclient --alternate-editor "" "$@"
+ emacsclient --alternate-editor="" "$@"
}
# Adapted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
--
cgit v1.2.3-70-g09d2