diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-04-21 07:51:36 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-04-21 07:51:36 -0700 |
| commit | 50d00e71530d584d20a339d3000a042c51c9d15b (patch) | |
| tree | ad1b5a901463899f81580383b517581ef26685e7 /src/emacs.c | |
| parent | 3f90aa7eec8909d6e4501dcd551665981b6b09af (diff) | |
| parent | 037970f1af6c87767501ac6d46c50abe9d3f44e0 (diff) | |
| download | emacs-50d00e71530d584d20a339d3000a042c51c9d15b.tar.gz | |
Merge from origin/emacs-26
037970f Document insert-image-file's return value (Bug#32978)
598b45a Autoload cua-toggle-rectangle-mark (Bug#34947)
95bd56d Tell xclip not to expect job-control under eshell (Bug#35257)
9997bbb ; * src/emacs.c: Fix typo in comment (Bug#35320).
a4ad7be Fix off-by-one-link error in image--set-property
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index 5eba88c74ff..8655f715e47 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -342,7 +342,7 @@ section of the Emacs manual or the file BUGS.\n" bool fatal_error_in_progress; #ifdef HAVE_NS -/* NS autrelease pool, for memory management. */ +/* NS autorelease pool, for memory management. */ static void *ns_pool; #endif |