From c067e710eb7d6e1606f0cdd76e37fe84104d33d8 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sat, 15 Jun 2019 08:40:23 -0400 Subject: [PATCH] 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. --- lisp/startup.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/startup.el b/lisp/startup.el index 32051c232c..f5463f2c93 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -2376,7 +2376,9 @@ (defun command-line-1 (args-left) (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))) -- 2.11.0