aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-09-15 14:11:14 +0200
committerLars Ingebrigtsen2019-09-15 14:11:14 +0200
commitf198a5c5144fdded1400df6e8454e4b1b912c7de (patch)
tree80eb3f2754e3a0ce2f2bf6f668a49667683ba777 /lib-src
parentdbc57b5573e2978581439fe8b81da80672c4ecd8 (diff)
downloademacs-f198a5c5144fdded1400df6e8454e4b1b912c7de.tar.gz
emacs-f198a5c5144fdded1400df6e8454e4b1b912c7de.zip
Revert "emacsclient: ignore --eval parameters when starting alternate editor"
This reverts commit 6fe661342a24edcaea255c3ba9a37613031554da. The alternate editor may be Emacs, which is useful when you want to eval something in an existing Emacs (if it exists), or in a new Emacs if there's no server running.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index e9469f77c5e..65effc6910f 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -700,11 +700,7 @@ fail (void)
700{ 700{
701 if (alternate_editor) 701 if (alternate_editor)
702 { 702 {
703 /* If the user has said --eval, then those aren't file name 703 size_t extra_args_size = (main_argc - optind + 1) * sizeof (char *);
704 parameters, so don't put them on the alternate_editor command
705 line. */
706 size_t extra_args_size =
707 (eval? 0: (main_argc - optind + 1) * sizeof (char *));
708 size_t new_argv_size = extra_args_size; 704 size_t new_argv_size = extra_args_size;
709 char **new_argv = xmalloc (new_argv_size); 705 char **new_argv = xmalloc (new_argv_size);
710 char *s = xstrdup (alternate_editor); 706 char *s = xstrdup (alternate_editor);