aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-12-22 10:13:46 -0800
committerPaul Eggert2016-12-22 10:14:11 -0800
commit73349822cbd6e50526eda9c75453584d73dfca83 (patch)
tree444c07a3fbaaf3b2b02e1a08a18bad5bab7bbef0 /src
parentb10bd71987cdeb753c106145d6270a359505359c (diff)
downloademacs-73349822cbd6e50526eda9c75453584d73dfca83.tar.gz
emacs-73349822cbd6e50526eda9c75453584d73dfca83.zip
; Spelling fixes
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.132
-rw-r--r--src/ChangeLog.32
-rw-r--r--src/process.c11
-rw-r--r--src/systhread.c2
-rw-r--r--src/thread.c11
-rw-r--r--src/thread.h4
6 files changed, 15 insertions, 17 deletions
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index 9e998952361..e8ab5e01ea7 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -17073,7 +17073,7 @@
170732013-05-04 Stefan Monnier <monnier@iro.umontreal.ca> 170732013-05-04 Stefan Monnier <monnier@iro.umontreal.ca>
17074 17074
17075 * minibuf.c (Fread_minibuffer, Feval_minibuffer): Move to Elisp. 17075 * minibuf.c (Fread_minibuffer, Feval_minibuffer): Move to Elisp.
17076 (syms_of_minibuf): Adjust accodingly. 17076 (syms_of_minibuf): Adjust accordingly.
17077 * lread.c (Fread): 17077 * lread.c (Fread):
17078 * callint.c (Fcall_interactively): Adjust calls accordingly. 17078 * callint.c (Fcall_interactively): Adjust calls accordingly.
17079 17079
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index a62aee7517b..256e4b78598 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -11648,7 +11648,7 @@
11648 11648
11649 * fileio.c (Fcopy_file): Always close descriptors. 11649 * fileio.c (Fcopy_file): Always close descriptors.
11650 11650
11651 * s-sunos4.h: read, write, open and close are interruptable. 11651 * s-sunos4.h: read, write, open and close are interruptible.
11652 11652
116531991-01-09 Jim Blandy (jimb@churchy.ai.mit.edu) 116531991-01-09 Jim Blandy (jimb@churchy.ai.mit.edu)
11654 11654
diff --git a/src/process.c b/src/process.c
index 9139a36d4fd..c5a46f992d7 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4557,23 +4557,22 @@ from PROCESS only, suspending reading output from other processes.
4557If JUST-THIS-ONE is an integer, don't run any timers either. 4557If JUST-THIS-ONE is an integer, don't run any timers either.
4558Return non-nil if we received any output from PROCESS (or, if PROCESS 4558Return non-nil if we received any output from PROCESS (or, if PROCESS
4559is nil, from any process) before the timeout expired. */) 4559is nil, from any process) before the timeout expired. */)
4560 (register Lisp_Object process, Lisp_Object seconds, Lisp_Object millisec, Lisp_Object just_this_one) 4560 (Lisp_Object process, Lisp_Object seconds, Lisp_Object millisec,
4561 Lisp_Object just_this_one)
4561{ 4562{
4562 intmax_t secs; 4563 intmax_t secs;
4563 int nsecs; 4564 int nsecs;
4564 4565
4565 if (! NILP (process)) 4566 if (! NILP (process))
4566 { 4567 {
4567 struct Lisp_Process *procp;
4568
4569 CHECK_PROCESS (process); 4568 CHECK_PROCESS (process);
4570 procp = XPROCESS (process); 4569 struct Lisp_Process *proc = XPROCESS (process);
4571 4570
4572 /* Can't wait for a process that is dedicated to a different 4571 /* Can't wait for a process that is dedicated to a different
4573 thread. */ 4572 thread. */
4574 if (!EQ (procp->thread, Qnil) && !EQ (procp->thread, Fcurrent_thread ())) 4573 if (!EQ (proc->thread, Qnil) && !EQ (proc->thread, Fcurrent_thread ()))
4575 error ("Attempt to accept output from process %s locked to thread %s", 4574 error ("Attempt to accept output from process %s locked to thread %s",
4576 SDATA (procp->name), SDATA (XTHREAD (procp->thread)->name)); 4575 SDATA (proc->name), SDATA (XTHREAD (proc->thread)->name));
4577 } 4576 }
4578 else 4577 else
4579 just_this_one = Qnil; 4578 just_this_one = Qnil;
diff --git a/src/systhread.c b/src/systhread.c
index 369d8f8b5e5..a2c556fd8e3 100644
--- a/src/systhread.c
+++ b/src/systhread.c
@@ -219,7 +219,7 @@ void
219sys_mutex_lock (sys_mutex_t *mutex) 219sys_mutex_lock (sys_mutex_t *mutex)
220{ 220{
221 /* FIXME: What happens if the owning thread exits without releasing 221 /* FIXME: What happens if the owning thread exits without releasing
222 the mutex? Accoding to MSDN, the result is undefined behavior. */ 222 the mutex? According to MSDN, the result is undefined behavior. */
223 EnterCriticalSection ((LPCRITICAL_SECTION)mutex); 223 EnterCriticalSection ((LPCRITICAL_SECTION)mutex);
224} 224}
225 225
diff --git a/src/thread.c b/src/thread.c
index 6966df31d37..9613d1435f7 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -257,7 +257,7 @@ If the current thread already owns MUTEX, increment the count and
257return. 257return.
258Otherwise, if no thread owns MUTEX, make the current thread own it. 258Otherwise, if no thread owns MUTEX, make the current thread own it.
259Otherwise, block until MUTEX is available, or until the current thread 259Otherwise, block until MUTEX is available, or until the current thread
260is signalled using `thread-signal'. 260is signaled using `thread-signal'.
261Note that calls to `mutex-lock' and `mutex-unlock' must be paired. */) 261Note that calls to `mutex-lock' and `mutex-unlock' must be paired. */)
262 (Lisp_Object mutex) 262 (Lisp_Object mutex)
263{ 263{
@@ -363,8 +363,7 @@ condition_wait_callback (void *arg)
363 XSETCONDVAR (cond, cvar); 363 XSETCONDVAR (cond, cvar);
364 self->event_object = cond; 364 self->event_object = cond;
365 saved_count = lisp_mutex_unlock_for_wait (&mutex->mutex); 365 saved_count = lisp_mutex_unlock_for_wait (&mutex->mutex);
366 /* If we were signalled while unlocking, we skip the wait, but we 366 /* If signaled while unlocking, skip the wait but reacquire the lock. */
367 still must reacquire our lock. */
368 if (NILP (self->error_symbol)) 367 if (NILP (self->error_symbol))
369 { 368 {
370 self->wait_condvar = &cvar->cond; 369 self->wait_condvar = &cvar->cond;
@@ -384,7 +383,7 @@ The mutex associated with COND must be held when this is called.
384It is an error if it is not held. 383It is an error if it is not held.
385 384
386This releases the mutex and waits for COND to be notified or for 385This releases the mutex and waits for COND to be notified or for
387this thread to be signalled with `thread-signal'. When 386this thread to be signaled with `thread-signal'. When
388`condition-wait' returns, COND's mutex will again be locked by 387`condition-wait' returns, COND's mutex will again be locked by
389this thread. */) 388this thread. */)
390 (Lisp_Object cond) 389 (Lisp_Object cond)
@@ -404,7 +403,7 @@ this thread. */)
404 return Qnil; 403 return Qnil;
405} 404}
406 405
407/* Used to communicate argumnets to condition_notify_callback. */ 406/* Used to communicate arguments to condition_notify_callback. */
408struct notify_args 407struct notify_args
409{ 408{
410 struct Lisp_CondVar *cvar; 409 struct Lisp_CondVar *cvar;
@@ -814,7 +813,7 @@ or `thread-join' in the target thread. */)
814 if (tstate == current_thread) 813 if (tstate == current_thread)
815 Fsignal (error_symbol, data); 814 Fsignal (error_symbol, data);
816 815
817 /* What to do if thread is already signalled? */ 816 /* What to do if thread is already signaled? */
818 /* What if error_symbol is Qnil? */ 817 /* What if error_symbol is Qnil? */
819 tstate->error_symbol = error_symbol; 818 tstate->error_symbol = error_symbol;
820 tstate->error_data = data; 819 tstate->error_data = data;
diff --git a/src/thread.h b/src/thread.h
index 0090652b358..33f8ea70636 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -48,7 +48,7 @@ struct thread_state
48 /* The thread's function. */ 48 /* The thread's function. */
49 Lisp_Object function; 49 Lisp_Object function;
50 50
51 /* If non-nil, this thread has been signalled. */ 51 /* If non-nil, this thread has been signaled. */
52 Lisp_Object error_symbol; 52 Lisp_Object error_symbol;
53 Lisp_Object error_data; 53 Lisp_Object error_data;
54 54
@@ -60,7 +60,7 @@ struct thread_state
60 /* A list of currently active byte-code execution value stacks. 60 /* A list of currently active byte-code execution value stacks.
61 Fbyte_code adds an entry to the head of this list before it starts 61 Fbyte_code adds an entry to the head of this list before it starts
62 processing byte-code, and it removed the entry again when it is 62 processing byte-code, and it removed the entry again when it is
63 done. Signalling an error truncates the list. */ 63 done. Signaling an error truncates the list. */
64 struct byte_stack *m_byte_stack_list; 64 struct byte_stack *m_byte_stack_list;
65#define byte_stack_list (current_thread->m_byte_stack_list) 65#define byte_stack_list (current_thread->m_byte_stack_list)
66 66