diff options
| author | Michael R. Mauger | 2017-07-03 15:32:41 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-03 15:32:41 -0400 |
| commit | 776635c01abd4aa759e7aa9584b513146978568c (patch) | |
| tree | 554f444bc96cb6b05435e8bf195de4df1b00df8f /src/thread.c | |
| parent | 77083e2d34ba5559ae2899d3b03cf08c2e6c5ad4 (diff) | |
| parent | 4cd0db3d6e6e4d5bd49283483bdafbbfc0f583f1 (diff) | |
| download | emacs-776635c01abd4aa759e7aa9584b513146978568c.tar.gz emacs-776635c01abd4aa759e7aa9584b513146978568c.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/thread.c')
| -rw-r--r-- | src/thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread.c b/src/thread.c index 9ea7e121a82..e3787971a53 100644 --- a/src/thread.c +++ b/src/thread.c | |||
| @@ -664,7 +664,7 @@ DEFUN ("thread-yield", Fthread_yield, Sthread_yield, 0, 0, 0, | |||
| 664 | static Lisp_Object | 664 | static Lisp_Object |
| 665 | invoke_thread_function (void) | 665 | invoke_thread_function (void) |
| 666 | { | 666 | { |
| 667 | int count = SPECPDL_INDEX (); | 667 | ptrdiff_t count = SPECPDL_INDEX (); |
| 668 | 668 | ||
| 669 | Ffuncall (1, ¤t_thread->function); | 669 | Ffuncall (1, ¤t_thread->function); |
| 670 | return unbind_to (count, Qnil); | 670 | return unbind_to (count, Qnil); |