diff options
| author | Paul Eggert | 2016-12-22 10:13:46 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-12-22 10:14:11 -0800 |
| commit | 73349822cbd6e50526eda9c75453584d73dfca83 (patch) | |
| tree | 444c07a3fbaaf3b2b02e1a08a18bad5bab7bbef0 | |
| parent | b10bd71987cdeb753c106145d6270a359505359c (diff) | |
| download | emacs-73349822cbd6e50526eda9c75453584d73dfca83.tar.gz emacs-73349822cbd6e50526eda9c75453584d73dfca83.zip | |
; Spelling fixes
| -rw-r--r-- | ChangeLog.2 | 2 | ||||
| -rw-r--r-- | doc/lispref/streams.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/variables.texi | 2 | ||||
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/bookmark.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-global.el | 2 | ||||
| -rw-r--r-- | lisp/image-dired.el | 8 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-init.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-ptch.el | 8 | ||||
| -rw-r--r-- | src/ChangeLog.13 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.3 | 2 | ||||
| -rw-r--r-- | src/process.c | 11 | ||||
| -rw-r--r-- | src/systhread.c | 2 | ||||
| -rw-r--r-- | src/thread.c | 11 | ||||
| -rw-r--r-- | src/thread.h | 4 | ||||
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/vc-tests.el | 2 | ||||
| -rw-r--r-- | test/src/thread-tests.el | 2 |
19 files changed, 34 insertions, 36 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index 0b73dc2f841..de67bbf6609 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 | |||
| @@ -26205,7 +26205,7 @@ | |||
| 26205 | 26205 | ||
| 26206 | 2015-08-07 Phillip Lord <phillip.lord@newcastle.ac.uk> | 26206 | 2015-08-07 Phillip Lord <phillip.lord@newcastle.ac.uk> |
| 26207 | 26207 | ||
| 26208 | Improve error signalling for seq-subseq | 26208 | Improve error signaling for seq-subseq |
| 26209 | * lisp/emacs-lisp/seq.el (seq-subseq): The existing behavior is to error | 26209 | * lisp/emacs-lisp/seq.el (seq-subseq): The existing behavior is to error |
| 26210 | when indexes are too large, but to silently ignore numbers which | 26210 | when indexes are too large, but to silently ignore numbers which |
| 26211 | are too negative for lists. String and vector handling errors in | 26211 | are too negative for lists. String and vector handling errors in |
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi index 41bc71e6aea..757e0e831be 100644 --- a/doc/lispref/streams.texi +++ b/doc/lispref/streams.texi | |||
| @@ -639,7 +639,7 @@ spacing between calls. | |||
| 639 | This function outputs a newline to @var{stream}. The name stands for | 639 | This function outputs a newline to @var{stream}. The name stands for |
| 640 | ``terminate print''. If @var{ensure} is non-@code{nil} no newline is printed | 640 | ``terminate print''. If @var{ensure} is non-@code{nil} no newline is printed |
| 641 | if @var{stream} is already at the beginning of a line. Note in this | 641 | if @var{stream} is already at the beginning of a line. Note in this |
| 642 | case @var{stream} can not be a function and an error is signalled if | 642 | case @var{stream} can not be a function and an error is signaled if |
| 643 | it is. This function returns @code{t} if a newline is printed. | 643 | it is. This function returns @code{t} if a newline is printed. |
| 644 | @end defun | 644 | @end defun |
| 645 | 645 | ||
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 40738e61f6b..d9096dac018 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi | |||
| @@ -809,7 +809,7 @@ functions. | |||
| 809 | 809 | ||
| 810 | @subsection Limitations | 810 | @subsection Limitations |
| 811 | 811 | ||
| 812 | There are a couple of ways in which a variable could be modifed (or at | 812 | There are a couple of ways in which a variable could be modified (or at |
| 813 | least appear to be modified) without triggering a watchpoint. | 813 | least appear to be modified) without triggering a watchpoint. |
| 814 | 814 | ||
| 815 | Since watchpoints are attached to symbols, modification to the | 815 | Since watchpoints are attached to symbols, modification to the |
| @@ -512,7 +512,7 @@ instead of shell command strings. This change affects | |||
| 512 | 'image-dired-cmd-pngnq-options', 'image-dired-cmd-pngcrush-options', | 512 | 'image-dired-cmd-pngnq-options', 'image-dired-cmd-pngcrush-options', |
| 513 | 'image-dired-cmd-create-standard-thumbnail-options' | 513 | 'image-dired-cmd-create-standard-thumbnail-options' |
| 514 | 514 | ||
| 515 | *** Recognizes more tools by default, including pngnq-s9, optipng, and gm | 515 | *** Recognizes more tools by default, including pngnq-s9, OptiPNG, and gm |
| 516 | 516 | ||
| 517 | *** 'find-file' and related commands now work on thumbnails and | 517 | *** 'find-file' and related commands now work on thumbnails and |
| 518 | displayed images, providing a default argument of the original file name | 518 | displayed images, providing a default argument of the original file name |
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index f3c8b2a755f..7d45832f58c 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -2123,7 +2123,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\ | |||
| 2123 | (current-buffer)))) | 2123 | (current-buffer)))) |
| 2124 | (read-string "Pattern: ") | 2124 | (read-string "Pattern: ") |
| 2125 | (when timer (cancel-timer timer) (setq timer nil))) | 2125 | (when timer (cancel-timer timer) (setq timer nil))) |
| 2126 | (when timer ;; Signalled an error or a `quit'. | 2126 | (when timer ;; Signaled an error or a `quit'. |
| 2127 | (cancel-timer timer) | 2127 | (cancel-timer timer) |
| 2128 | (bookmark-bmenu-list) | 2128 | (bookmark-bmenu-list) |
| 2129 | (bookmark-bmenu-goto-bookmark bmk))))) | 2129 | (bookmark-bmenu-goto-bookmark bmk))))) |
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index 03a21b0ee0d..4793c53f80d 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el | |||
| @@ -47,7 +47,7 @@ in a GNU Global supported hierarchy. | |||
| 47 | 47 | ||
| 48 | Two sanity checks are performed to assure (a) that GNU global program exists | 48 | Two sanity checks are performed to assure (a) that GNU global program exists |
| 49 | and (b) that the GNU global program version is compatibility with the database | 49 | and (b) that the GNU global program version is compatibility with the database |
| 50 | version. If optional NOERROR is nil, then an error may be signalled on version | 50 | version. If optional NOERROR is nil, then an error may be signaled on version |
| 51 | mismatch. If NOERROR is not nil, then no error will be signaled. Instead | 51 | mismatch. If NOERROR is not nil, then no error will be signaled. Instead |
| 52 | return value will indicate success or failure with non-nil or nil respective | 52 | return value will indicate success or failure with non-nil or nil respective |
| 53 | values." | 53 | values." |
diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 560cadbe75b..2af72fc4527 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el | |||
| @@ -262,7 +262,7 @@ is replaced by the file name of the temporary file." | |||
| 262 | (executable-find "pngnq-s9")) | 262 | (executable-find "pngnq-s9")) |
| 263 | "The file name of the `pngnq' program. | 263 | "The file name of the `pngnq' program. |
| 264 | It quantizes colors of PNG images down to 256 colors or fewer | 264 | It quantizes colors of PNG images down to 256 colors or fewer |
| 265 | using the Neuquant procedure." | 265 | using the NeuQuant algorithm." |
| 266 | :version "26.1" | 266 | :version "26.1" |
| 267 | :type '(choice (const :tag "Not Set" nil) file) | 267 | :type '(choice (const :tag "Not Set" nil) file) |
| 268 | :group 'image-dired) | 268 | :group 'image-dired) |
| @@ -702,7 +702,7 @@ Increase at own risk.") | |||
| 702 | process)) | 702 | process)) |
| 703 | 703 | ||
| 704 | (defun image-dired-pngcrush-thumb (spec) | 704 | (defun image-dired-pngcrush-thumb (spec) |
| 705 | "Optimize thumbnail decsribed by format SPEC with pngcrush(1)." | 705 | "Optimize thumbnail described by format SPEC with pngcrush(1)." |
| 706 | ;; If pngnq wasn't run, then the THUMB-nq8.png file does not exist. | 706 | ;; If pngnq wasn't run, then the THUMB-nq8.png file does not exist. |
| 707 | ;; pngcrush needs an infile and outfile, so we just copy THUMB to | 707 | ;; pngcrush needs an infile and outfile, so we just copy THUMB to |
| 708 | ;; THUMB-nq8.png and use the latter as a temp file. | 708 | ;; THUMB-nq8.png and use the latter as a temp file. |
| @@ -727,7 +727,7 @@ Increase at own risk.") | |||
| 727 | process)) | 727 | process)) |
| 728 | 728 | ||
| 729 | (defun image-dired-optipng-thumb (spec) | 729 | (defun image-dired-optipng-thumb (spec) |
| 730 | "Optimize thumbnail decsribed by format SPEC with optipng(1)." | 730 | "Optimize thumbnail described by format SPEC with optipng(1)." |
| 731 | (let ((process | 731 | (let ((process |
| 732 | (apply #'start-process "image-dired-optipng" nil | 732 | (apply #'start-process "image-dired-optipng" nil |
| 733 | image-dired-cmd-optipng-program | 733 | image-dired-cmd-optipng-program |
| @@ -765,7 +765,7 @@ Increase at own risk.") | |||
| 765 | (make-directory thumbnail-dir t) | 765 | (make-directory thumbnail-dir t) |
| 766 | (set-file-modes thumbnail-dir #o700)) | 766 | (set-file-modes thumbnail-dir #o700)) |
| 767 | 767 | ||
| 768 | ;; Thumbnail file creation processes begin here and are marshalled | 768 | ;; Thumbnail file creation processes begin here and are marshaled |
| 769 | ;; in a queue by `image-dired-create-thumb'. | 769 | ;; in a queue by `image-dired-create-thumb'. |
| 770 | (setq process | 770 | (setq process |
| 771 | (apply #'start-process "image-dired-create-thumbnail" nil | 771 | (apply #'start-process "image-dired-create-thumbnail" nil |
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 5b48c8d93df..d5ea002fa82 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -1884,7 +1884,7 @@ With a prefix argument, REVERSE the hunk." | |||
| 1884 | ;; Advance to the next hunk with skip-hunk-start set to t | 1884 | ;; Advance to the next hunk with skip-hunk-start set to t |
| 1885 | ;; because we want the behavior of moving to the next logical | 1885 | ;; because we want the behavior of moving to the next logical |
| 1886 | ;; hunk, not the original behavior where were would sometimes | 1886 | ;; hunk, not the original behavior where were would sometimes |
| 1887 | ;; stay on the curent hunk. This is the behavior we get when | 1887 | ;; stay on the current hunk. This is the behavior we get when |
| 1888 | ;; navigating through hunks interactively, and we want it when | 1888 | ;; navigating through hunks interactively, and we want it when |
| 1889 | ;; applying hunks too (see http://debbugs.gnu.org/17544). | 1889 | ;; applying hunks too (see http://debbugs.gnu.org/17544). |
| 1890 | (when diff-advance-after-apply-hunk | 1890 | (when diff-advance-after-apply-hunk |
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index b0d5d2fabc4..c96a9684ac8 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el | |||
| @@ -318,7 +318,7 @@ It needs to be killed when we quit the session.") | |||
| 318 | (defsubst ediff-patch-metajob (&optional metajob) | 318 | (defsubst ediff-patch-metajob (&optional metajob) |
| 319 | (memq (or metajob ediff-metajob-name) | 319 | (memq (or metajob ediff-metajob-name) |
| 320 | '(ediff-multifile-patch))) | 320 | '(ediff-multifile-patch))) |
| 321 | ;; metajob involving only one group of files, such as multipatch or directory | 321 | ;; metajob involving only one group of files, such as multi-patch or directory |
| 322 | ;; revision | 322 | ;; revision |
| 323 | (defsubst ediff-one-filegroup-metajob (&optional metajob) | 323 | (defsubst ediff-one-filegroup-metajob (&optional metajob) |
| 324 | (or (ediff-revision-metajob metajob) | 324 | (or (ediff-revision-metajob metajob) |
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index 3effd9b2cf9..9f0e1dcf4f7 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el | |||
| @@ -431,15 +431,15 @@ Please advise: | |||
| 431 | (f2-exists (setcar session-file-object file2)) | 431 | (f2-exists (setcar session-file-object file2)) |
| 432 | (f1-exists (setcar session-file-object file1)) | 432 | (f1-exists (setcar session-file-object file1)) |
| 433 | (t | 433 | (t |
| 434 | ;; TODO: Often for multipaches the file doesn't exist because the | 434 | ;; TODO: Often for multi-patches the file doesn't exist |
| 435 | ;; directory part is wrong; for instance, if the patch need to | 435 | ;; because the directory part is wrong; for instance, if the |
| 436 | ;; be applied into | 436 | ;; patch needs to be applied into |
| 437 | ;; (expand-file-name "lisp/vc/ediff-ptch.el" source-directory) | 437 | ;; (expand-file-name "lisp/vc/ediff-ptch.el" source-directory) |
| 438 | ;; and default-directory is | 438 | ;; and default-directory is |
| 439 | ;; (expand-file-name "lisp" source-directory) | 439 | ;; (expand-file-name "lisp" source-directory) |
| 440 | ;; then Ediff assumes the wrong file: | 440 | ;; then Ediff assumes the wrong file: |
| 441 | ;; (expand-file-name "lisp/ediff-ptch.el" source-directory). | 441 | ;; (expand-file-name "lisp/ediff-ptch.el" source-directory). |
| 442 | ;; We might identify these common failoures and suggest | 442 | ;; We might identify these common failures and suggest |
| 443 | ;; in the prompt the possible corrected file. --Tino | 443 | ;; in the prompt the possible corrected file. --Tino |
| 444 | (with-output-to-temp-buffer ediff-msg-buffer | 444 | (with-output-to-temp-buffer ediff-msg-buffer |
| 445 | (ediff-with-current-buffer standard-output | 445 | (ediff-with-current-buffer standard-output |
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 @@ | |||
| 17073 | 2013-05-04 Stefan Monnier <monnier@iro.umontreal.ca> | 17073 | 2013-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 | ||
| 11653 | 1991-01-09 Jim Blandy (jimb@churchy.ai.mit.edu) | 11653 | 1991-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. | |||
| 4557 | If JUST-THIS-ONE is an integer, don't run any timers either. | 4557 | If JUST-THIS-ONE is an integer, don't run any timers either. |
| 4558 | Return non-nil if we received any output from PROCESS (or, if PROCESS | 4558 | Return non-nil if we received any output from PROCESS (or, if PROCESS |
| 4559 | is nil, from any process) before the timeout expired. */) | 4559 | is 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 | |||
| 219 | sys_mutex_lock (sys_mutex_t *mutex) | 219 | sys_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 | |||
| 257 | return. | 257 | return. |
| 258 | Otherwise, if no thread owns MUTEX, make the current thread own it. | 258 | Otherwise, if no thread owns MUTEX, make the current thread own it. |
| 259 | Otherwise, block until MUTEX is available, or until the current thread | 259 | Otherwise, block until MUTEX is available, or until the current thread |
| 260 | is signalled using `thread-signal'. | 260 | is signaled using `thread-signal'. |
| 261 | Note that calls to `mutex-lock' and `mutex-unlock' must be paired. */) | 261 | Note 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. | |||
| 384 | It is an error if it is not held. | 383 | It is an error if it is not held. |
| 385 | 384 | ||
| 386 | This releases the mutex and waits for COND to be notified or for | 385 | This releases the mutex and waits for COND to be notified or for |
| 387 | this thread to be signalled with `thread-signal'. When | 386 | this 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 |
| 389 | this thread. */) | 388 | this 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. */ |
| 408 | struct notify_args | 407 | struct 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 | ||
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 2884187fa0a..3d92dff3811 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -2138,7 +2138,7 @@ This does not support special file names." | |||
| 2138 | 2138 | ||
| 2139 | (defun tramp--test-windows-nt-and-batch () | 2139 | (defun tramp--test-windows-nt-and-batch () |
| 2140 | "Check, whether the locale host runs MS Windows in batch mode. | 2140 | "Check, whether the locale host runs MS Windows in batch mode. |
| 2141 | This does not support scpecial characters." | 2141 | This does not support special characters." |
| 2142 | (and (eq system-type 'windows-nt) noninteractive)) | 2142 | (and (eq system-type 'windows-nt) noninteractive)) |
| 2143 | 2143 | ||
| 2144 | (defun tramp--test-windows-nt-and-pscp-psftp-p () | 2144 | (defun tramp--test-windows-nt-and-pscp-psftp-p () |
diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el index 8dc72cd7c81..b54a45dd323 100644 --- a/test/lisp/vc/vc-tests.el +++ b/test/lisp/vc/vc-tests.el | |||
| @@ -206,7 +206,7 @@ For backends which dont support it, it is emulated." | |||
| 206 | ;; FIXME: Why isn't there `vc-unregister'? | 206 | ;; FIXME: Why isn't there `vc-unregister'? |
| 207 | (defun vc-test--unregister-function (backend file) | 207 | (defun vc-test--unregister-function (backend file) |
| 208 | "Run the `vc-unregister' backend function. | 208 | "Run the `vc-unregister' backend function. |
| 209 | For backends which don't support it, `vc-not-supported' is signalled." | 209 | For backends which don't support it, `vc-not-supported' is signaled." |
| 210 | ;; CVS, SVN, SCCS, SRC and Mtn are not supported, and will signal | 210 | ;; CVS, SVN, SCCS, SRC and Mtn are not supported, and will signal |
| 211 | ;; `vc-not-supported'. | 211 | ;; `vc-not-supported'. |
| 212 | (prog1 | 212 | (prog1 |
diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el index 26c0b725ff8..73da72e8369 100644 --- a/test/src/thread-tests.el +++ b/test/src/thread-tests.el | |||
| @@ -153,7 +153,7 @@ | |||
| 153 | (mutex-lock threads-mutex)) | 153 | (mutex-lock threads-mutex)) |
| 154 | 154 | ||
| 155 | (ert-deftest threads-mutex-signal () | 155 | (ert-deftest threads-mutex-signal () |
| 156 | "test signalling a blocked thread" | 156 | "test signaling a blocked thread" |
| 157 | (should | 157 | (should |
| 158 | (progn | 158 | (progn |
| 159 | (setq threads-mutex (make-mutex)) | 159 | (setq threads-mutex (make-mutex)) |