diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-27 20:59:50 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-27 21:00:36 +0200 |
| commit | 6fe661342a24edcaea255c3ba9a37613031554da (patch) | |
| tree | 0cd3beedc498f228cc9cdf03b88471a8faf83f5b /lib-src | |
| parent | 9997429cb7f960a1a08c7dfb4848a0cb60107f57 (diff) | |
| download | emacs-6fe661342a24edcaea255c3ba9a37613031554da.tar.gz | |
emacsclient: ignore --eval parameters when starting alternate editor
* lib-src/emacsclient.c (fail): If the user said --eval, don't
pass those arguments to the alternate editor as file names.
Suggested by a patch from Scott Turner (bug#11474).
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 39dd10e7fb1..ba2721e8bc9 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -700,7 +700,11 @@ fail (void) { if (alternate_editor) { - size_t extra_args_size = (main_argc - optind + 1) * sizeof (char *); + /* If the user has said --eval, then those aren't file name + parameters, so don't put them on the alternate_editor command + line. */ + size_t extra_args_size = + (eval? 0: (main_argc - optind + 1) * sizeof (char *)); size_t new_argv_size = extra_args_size; char **new_argv = xmalloc (new_argv_size); char *s = xstrdup (alternate_editor); |