From: Noam Postavsky <npostavs@gmail.com>
Date: Sat, 15 Jun 2019 12:40:23 +0000 (-0400)
Subject: Allow trailing whitespace in --eval argument (Bug#36219)
X-Git-Tag: emacs-27.0.90~2490
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1b230b58a4176a574bcb37573c82d1ccc71633c;p=emacs.git

Allow trailing whitespace in --eval argument (Bug#36219)

* lisp/startup.el (command-line-1): Don't complain about trailing
garbage if it's only space, tab, or newline characters.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 90046389d16..7759ed5aed3 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2413,7 +2413,9 @@ nil default-directory" name)
                             (read-data (read-from-string str-expr))
                             (expr (car read-data))
                             (end (cdr read-data)))
-                       (unless (= end (length str-expr))
+                       ;; Allow same trailing chars as minibuf.c's
+                       ;; `string_to_object'.
+                       (unless (string-match-p "[\s\t\n]*\\'" str-expr end)
                          (error "Trailing garbage following expression: %s"
                                 (substring str-expr end)))
                        (eval expr t)))