diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
| commit | 4e79f77635a80e0c25841ba15feb0e70c8824516 (patch) | |
| tree | 7f68cf7d809a10e6c2501fb3d9451047fb8da051 /lisp/emacs-lisp/eldoc.el | |
| parent | e1d93302c29916e738552484b9363c5b9e77c5c1 (diff) | |
| parent | 5e47ec95118c06dd66cd488ad25775d801d75c0c (diff) | |
| download | emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.gz emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.bz2 emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.zip | |
Merge from origin/emacs-28
5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo.
ba0871bef1 ; Fix typos: prefer American spelling
e3e7f31faa Adapt Tramp doc
# Conflicts:
# etc/NEWS
# etc/themes/modus-themes.el
# lisp/emacs-lisp/byte-opt.el
# test/lisp/so-long-tests/spelling-tests.el
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 0b8078579cc..b08a268c90f 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -812,7 +812,7 @@ function passes responsibility to the functions in Other third-party values of `eldoc-documentation-strategy' should not use `eldoc--make-callback'. They must find some alternate way to produce callbacks to feed to -`eldoc-documentation-functions' and should endeavour to display +`eldoc-documentation-functions' and should endeavor to display the docstrings eventually produced, using `eldoc-display-functions'." (let* (;; How many callbacks have been created by the strategy |