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 90046389d16ac999dc555818cffce1931a19a845..7759ed5aed320cd933ec1c3d8712edcb3d4b6b64 100644 (file)
--- 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)))