1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From: Russ Allbery <rra@debian.org>
Date: Sun, 14 Aug 2016 14:22:52 -0700
Subject: Fix spelling errors
occured -> occurred everywhere
---
CHANGES | 4 ++--
src/command.c | 2 +-
src/signals.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CHANGES b/CHANGES
index 037c766..dfc5029 100644
--- a/CHANGES
+++ b/CHANGES
@@ -316,7 +316,7 @@ Renamed BACKGROUND hook to BGTRIG (but old name still works).
Added BGTEXT hook.
Fixed activity_status.tf to update for lines generated by /echo -w.
Fixed: ACTIVITY and PREACTIVITY hooks didn't run in the world in which the
- activity occured when caused by /echo -w.
+ activity occurred when caused by /echo -w.
Fixed order of /dc message relative to text already queued on socket.
Fixed: under certain conditions, a dead socket would not go away and could
not be foregrounded.
@@ -972,7 +972,7 @@ Fixed compilation error involving conditional and hstrerror under some
lame compilers (socket.c:788).
Fixed output misdirection during a read() inside a command sub.
Fixed rare bug causing command line to execute in wrong world when a
- simultaneous background trigger occured.
+ simultaneous background trigger occurred.
Fixed /world with no arguments.
Fixed fatal input bug after /histsize -i. (35a21)
Fixed bug which disabled history recording after /recall on an empty history.
diff --git a/src/command.c b/src/command.c
index 0409787..624d03b 100644
--- a/src/command.c
+++ b/src/command.c
@@ -605,7 +605,7 @@ int do_file_load(const char *args, int tinytalk)
!user_result->u.ival && !warned)
{
eprintf("(This line was implicitly treated as an /addworld "
- "because it occured before the first '/' line and did not "
+ "because it occurred before the first '/' line and did not "
"start with a '/', ';', or '#'.)");
warned = 1;
}
diff --git a/src/signals.c b/src/signals.c
index bd96b87..a00c70e 100644
--- a/src/signals.c
+++ b/src/signals.c
@@ -410,7 +410,7 @@ static char initial_dir[PATH_MAX+1] = "."; /* default: many users never chdir */
static void coremsg(FILE *dumpfile)
{
fputs("Also describe what you were doing in tf when this\r\n", stderr);
- fputs("occured, and whether you can repeat it.\r\n\n", stderr);
+ fputs("occurred, and whether you can repeat it.\r\n\n", stderr);
fprintf(dumpfile, "> %.512s\r\n", version);
if (*sysname) fprintf(dumpfile, "> %.256s\r\n", sysname);
fprintf(dumpfile, "> %.256s\r\n", featurestr->data);
|
