diff options
| author | Glenn Morris | 2020-01-08 09:09:47 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-01-08 09:09:47 -0800 |
| commit | b968b733a2a0450eb7312a5e72c059ec3c59ddd9 (patch) | |
| tree | da0790ada823a4d7dee009e9df63b3b24d0d539b /src/thread.h | |
| parent | f8a0b02949342b887822e7756fd36f06536c9c01 (diff) | |
| parent | 6cd9ccb0a28ec03ffe180b7429e0378511b7d459 (diff) | |
| download | emacs-b968b733a2a0450eb7312a5e72c059ec3c59ddd9.tar.gz emacs-b968b733a2a0450eb7312a5e72c059ec3c59ddd9.zip | |
Merge from origin/emacs-27
6cd9ccb0a2 (origin/emacs-27) Fix compression of directories in Dired
42329e6d3b ; * etc/NEWS: Review of the whole text.
af5709f16b Further enhancement on `tramp-file-local-name'
fb432446f5 Objective C Mode imenu: cease recognizing "functions" with...
a18373a999 ; * etc/NEWS: Update the text about the XDG_CONFIG_HOME/em...
73fd8a4b53 Fix BSD and macOS builds w.r.t. pthread_setname_np (bug#38...
f54b24304d Scale top-left coordinates in display-monitor-attributes-list
b46c75b16c xref-matches-in-files: Big Tramp speed-up
883b3490d8 * lisp/net/tramp.el (tramp-file-local-name): Remove `save-...
c01f55f126 Fix rendering bug due to unsynchronized cairo surface size...
075f21c0e3 Avoid crash by access to cleared img->pixmap->data/img->ma...
16c6dfb4f1 Avoid assertion violations in very small-height windows
9063124b91 Use pthread_setname_np to set thread name
# Conflicts:
# etc/NEWS
# lisp/net/tramp.el
Diffstat (limited to 'src/thread.h')
| -rw-r--r-- | src/thread.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/thread.h b/src/thread.h index e96a063a10b..a09929fa440 100644 --- a/src/thread.h +++ b/src/thread.h | |||
| @@ -169,8 +169,7 @@ struct thread_state | |||
| 169 | interrupter should broadcast to this condition. */ | 169 | interrupter should broadcast to this condition. */ |
| 170 | sys_cond_t *wait_condvar; | 170 | sys_cond_t *wait_condvar; |
| 171 | 171 | ||
| 172 | /* Thread's name in the locale encoding. Actually used only on | 172 | /* Thread's name in the locale encoding. */ |
| 173 | WINDOWSNT. */ | ||
| 174 | char *thread_name; | 173 | char *thread_name; |
| 175 | 174 | ||
| 176 | /* This thread might have released the global lock. If so, this is | 175 | /* This thread might have released the global lock. If so, this is |