diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-11-16 09:05:31 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-11-16 09:05:31 -0800 |
| commit | 4a8c1120f5deac6d4b4a5e7109af583818510735 (patch) | |
| tree | 426a976065a519af607545d0e6aef316e533b4d6 /lisp/emacs-lisp | |
| parent | 5fe469f02d9d5ec58f3ff8d73ff50b1ec2c6ea2a (diff) | |
| parent | 75723ec212ca0ac0b5f019622960caf083e95105 (diff) | |
| download | emacs-4a8c1120f5deac6d4b4a5e7109af583818510735.tar.gz emacs-4a8c1120f5deac6d4b4a5e7109af583818510735.tar.bz2 emacs-4a8c1120f5deac6d4b4a5e7109af583818510735.zip | |
Merge from origin/emacs-27
75723ec212 (origin/emacs-27) ; * lisp/emacs-lisp/benchmark.el (benchm...
53e2a612ad ; * lib-src/make-fingerprint.c: Update commentary.
286c632772 Reformat argument commentary in etags.c
4ec740866a Make the invocation of combine-change-calls in comment-reg...
66bcec8838 * lisp/progmodes/cc-langs.el (c-<>-notable-chars-re): Fix ...
03eeab469e ; Update the expected result files in test/manual/etags.
d875a22bc6 Update the various INSTALL files
# Conflicts:
# INSTALL
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/benchmark.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index 2fa5a878801..8cf1f54411a 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el @@ -43,7 +43,7 @@ ;;;###autoload (defmacro benchmark-run (&optional repetitions &rest forms) "Time execution of FORMS. -If REPETITIONS is supplied as a number, run forms that many times, +If REPETITIONS is supplied as a number, run FORMS that many times, accounting for the overhead of the resulting loop. Otherwise run FORMS once. Return a list of the total elapsed time for execution, the number of |