aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2017-12-24 22:04:35 +0000
committerTatsuya Kinoshita <tats@debian.org>2017-12-24 22:04:35 +0000
commit64f5b0d7ca9f9cda6ce10f9cb166baac92f8483d (patch)
tree67514b7749d0828d95153503d423f6bf90f05f9e
parentUpdate ChangeLog (diff)
parentfix spelling error (diff)
downloadw3m-64f5b0d7ca9f9cda6ce10f9cb166baac92f8483d.tar.gz
w3m-64f5b0d7ca9f9cda6ce10f9cb166baac92f8483d.zip
Merge branch 'master-dai'
-rw-r--r--scripts/w3mman/w3mman.1.in2
-rw-r--r--terms.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/w3mman/w3mman.1.in b/scripts/w3mman/w3mman.1.in
index 904fb5d..8c433a7 100644
--- a/scripts/w3mman/w3mman.1.in
+++ b/scripts/w3mman/w3mman.1.in
@@ -67,7 +67,7 @@ If W3MMAN_MAN is set, its value is used instead of @MAN@.
.SH FILES
.TP
.I @libexecdir@/@PACKAGE@/cgi-bin/w3mman2html.cgi
-manual page to HTML convertor.
+manual page to HTML converter.
.SH SEE ALSO
.BR man (1),
.BR w3m (1).
diff --git a/terms.c b/terms.c
index 3d2ffd7..a636ac0 100644
--- a/terms.c
+++ b/terms.c
@@ -823,7 +823,7 @@ ttymode_set(int mode, int imode)
while (TerminalSet(tty, &ioval) == -1) {
if (errno == EINTR || errno == EAGAIN)
continue;
- printf("Error occured while set %x: errno=%d\n", mode, errno);
+ printf("Error occurred while set %x: errno=%d\n", mode, errno);
reset_error_exit(SIGNAL_ARGLIST);
}
#endif
@@ -844,7 +844,7 @@ ttymode_reset(int mode, int imode)
while (TerminalSet(tty, &ioval) == -1) {
if (errno == EINTR || errno == EAGAIN)
continue;
- printf("Error occured while reset %x: errno=%d\n", mode, errno);
+ printf("Error occurred while reset %x: errno=%d\n", mode, errno);
reset_error_exit(SIGNAL_ARGLIST);
}
#endif /* __MINGW32_VERSION */
@@ -861,7 +861,7 @@ set_cc(int spec, int val)
while (TerminalSet(tty, &ioval) == -1) {
if (errno == EINTR || errno == EAGAIN)
continue;
- printf("Error occured: errno=%d\n", errno);
+ printf("Error occurred: errno=%d\n", errno);
reset_error_exit(SIGNAL_ARGLIST);
}
}
@@ -2282,7 +2282,7 @@ sleep_till_anykey(int sec, int purge)
}
er = TerminalSet(tty, &ioval);
if (er == -1) {
- printf("Error occured: errno=%d\n", errno);
+ printf("Error occurred: errno=%d\n", errno);
reset_error_exit(SIGNAL_ARGLIST);
}
return ret;