summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2019-06-15 08:40:23 -0400
committerNoam Postavsky <npostavs@gmail.com>2019-06-15 17:05:56 -0400
commita1b230b58a4176a574bcb37573c82d1ccc71633c (patch)
tree6fb692b2f753c9489ed2211da10b705045da8f27 /lisp/startup.el
parentf8b976546344e69728925753c2e41d31a04fe6c4 (diff)
downloademacs-a1b230b58a4176a574bcb37573c82d1ccc71633c.tar.gz
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.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el4
1 files changed, 3 insertions, 1 deletions
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)))