diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-23 06:30:12 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-23 06:30:12 +0100 |
| commit | 99feed933ac8b8a3384eeb40254ef2e2de4f31de (patch) | |
| tree | 5f28e85fd3915dd9350375c067762d857bbdfbb5 /src | |
| parent | 17bf6a829ca2fd2920c01e1aee30ab16b9c672eb (diff) | |
| parent | 0754173c923a1888a1b18b4c6c5d1dc72e6cc6af (diff) | |
Merge from origin/emacs-29
0754173c923 ; Fix docstring
014232d3840 Eglot: eglot--servers-by-xrefed-file doesn't need to be v...
bbe35c280c2 Prevent stale servers when using eglot-extend-to-xref
9bf13a3fb9e ; * src/alloc.c (Fmemory_info): Doc fix.
baa33a5c054 * etc/tutorials/TUTORIAL.cn: Fix typos. (Bug#60221)
98d7f76b451 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
a488a6870ac Add alias for removed font-lock function
02e046566e2 Set beginning/end-of-defun-function in treesit-major-mode...
7dea58b88db Add treesit-defun-at-point and fix c-ts-mode-indent-defun
69123d4aa4e ; Fix treesit--defuns-around
05d8310fb5d Use the new keyword ':repeat' in repeatable keymaps.
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 2975754124a..e7edc0595b3 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -7693,7 +7693,7 @@ DEFUN ("memory-info", Fmemory_info, Smemory_info, 0, 0, 0, All values are in Kbytes. If there is no swap space, last two values are zero. If the system is not supported or memory information can't be obtained, return nil. -If `default-directory’ is remote, return memory information of the +If `default-directory' is remote, return memory information of the respective remote host. */) (void) { |