diff options
| author | Tassilo Horn <tsdh@gnu.org> | 2019-09-22 11:02:39 +0200 |
|---|---|---|
| committer | Tassilo Horn <tsdh@gnu.org> | 2019-09-22 11:02:39 +0200 |
| commit | af0642a4cb220f33a43d1380be085bc0b7134bb8 (patch) | |
| tree | e3b1b57bc42e712c77bd55fc4fc722cf93fe6c66 /lib-src | |
| parent | 8992bc7d1b7e7babbf2899b5c45e84b486f504e6 (diff) | |
| parent | 37a4233a366797360c2f4f475591a3406586bcfb (diff) | |
| download | emacs-scratch/tsdh-vc-list-files.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/tsdh-vc-list-filesscratch/tsdh-vc-list-files
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 6 |
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); |