diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-04-18 07:50:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-04-18 07:50:22 -0700 |
| commit | 4819bea6900348f923e0de58995ec41760993b6c (patch) | |
| tree | df5ba765ab0270a215671959a099a65e9f2a2f58 /test/lisp/simple-tests.el | |
| parent | 9dac60b1bf449cc42fe77bc4f3a85bad55afa00f (diff) | |
| parent | f3b62b6c62c41d2e5d15418ea940bce6b11bdf7d (diff) | |
| download | emacs-4819bea6900348f923e0de58995ec41760993b6c.tar.gz emacs-4819bea6900348f923e0de58995ec41760993b6c.tar.bz2 emacs-4819bea6900348f923e0de58995ec41760993b6c.zip | |
Merge from origin/emacs-27
f3b62b6c62 (origin/emacs-27) Avoid crashes in regex-emacs.c due to GC
175c61c18b Fix "C-u M-!" when 'shell-command-dont-erase-buffer' is no...
6b297519b5 Fix cl-most-positive-float doc typo
c36c5a3ded ; lisp/ldefs-boot.el: Update.
3876a60569 Fix a typo in calculator.el
9e832ba91b * lisp/erc/erc.el: Add URL to the new ERC page on the Emac...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'test/lisp/simple-tests.el')
| -rw-r--r-- | test/lisp/simple-tests.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el index eb3b0296ea8..fa71e26d21e 100644 --- a/test/lisp/simple-tests.el +++ b/test/lisp/simple-tests.el @@ -766,7 +766,7 @@ See Bug#21722." (,output-buf (if ,output-buffer-is-current ,caller-buf (generate-new-buffer "output-buf"))) (emacs (expand-file-name invocation-name invocation-directory)) - (,command (format "%s -Q --batch --eval '(princ \"%s\")'" + (,command (format "%s -Q --batch --eval \"(princ \\\"%s\\\")\"" emacs ,str)) (inhibit-message t)) (unwind-protect @@ -803,7 +803,7 @@ See Bug#21722." (expected-point `((beg-last-out . ,(1+ (length str))) (end-last-out . ,(1+ (* 2 (length str)))) (save-point . 1)))) - (dolist (output-buffer-is-current '(t ni)) + (dolist (output-buffer-is-current '(nil)) (with-shell-command-dont-erase-buffer str output-buffer-is-current (when (memq shell-command-dont-erase-buffer '(beg-last-out end-last-out save-point)) (should (= (point) (alist-get shell-command-dont-erase-buffer expected-point)))))))) |