aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorStephen Leake2019-09-18 17:43:28 -0700
committerStephen Leake2019-09-18 17:43:28 -0700
commit34f1035e878a06ad181ff7fc533cd1fa0a565847 (patch)
tree7708b0e62b09571ba5b2c625d810cd932c380508 /lib-src
parentb478444099655f36f7b243e21e8f98051299ca8f (diff)
parent107ce3050fc37b9a13d8304ae1bb73fac9de5f61 (diff)
downloademacs-34f1035e878a06ad181ff7fc533cd1fa0a565847.tar.gz
emacs-34f1035e878a06ad181ff7fc533cd1fa0a565847.zip
Merge commit '107ce3050fc37b9a13d8304ae1bb73fac9de5f61'
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);