diff options
author | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
commit | cf1e8e792f60949e09e3ad4c53fb61b0b7628229 (patch) | |
tree | 35080229c9e3b46e5db14a2f051c001ab8c6e586 /test/lisp/jsonrpc-tests.el | |
parent | 39792cf62987ecc1a772f6a2027d6b32c70e8312 (diff) | |
parent | d0c47652e527397cae96444c881bf60455c763c1 (diff) | |
download | emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.tar.gz emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.tar.bz2 emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.zip |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'test/lisp/jsonrpc-tests.el')
-rw-r--r-- | test/lisp/jsonrpc-tests.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el index ea340c370d1..92306d1c7e5 100644 --- a/test/lisp/jsonrpc-tests.el +++ b/test/lisp/jsonrpc-tests.el @@ -244,7 +244,7 @@ :timeout 1) ;; Wait another 0.5 secs just in case the success handlers of ;; one of these last two requests didn't quite have a chance to - ;; run (Emacs 25.2 apparentely needs this). + ;; run (Emacs 25.2 apparently needs this). (accept-process-output nil 0.5) (should second-deferred-went-through-p) (should (eq 1 n-deferred-1)) |