Merge remote-tracking branch 'origin/master' into scratch/tsdh-vc-list-filesscratch/tsdh-vc-list-files

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)
 {
   if (alternate_editor)
     {
-      /* 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 extra_args_size = (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);