Module Name: src
Committed By: jdc
Date: Wed Mar 21 21:27:42 UTC 2012
Modified Files:
src/sys/dev/wscons [netbsd-5-0]: wsemul_vt100.c wsemul_vt100_chars.c
wsksymdef.h
Log Message:
Pull up revisions (requested by bouyer in ticket #1727):
src/sys/dev/wscons/wsemul_vt100.c 1.31
src/sys/dev/wscons/wsemul_vt100_chars.c 1.12
src/sys/dev/wscons/wsksymdef.h 1.62
s/portugese/portuguese/, spotted by Ari Constancio in PR misc/40202.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.70.1 src/sys/dev/wscons/wsemul_vt100.c
cvs rdiff -u -r1.11 -r1.11.92.1 src/sys/dev/wscons/wsemul_vt100_chars.c
cvs rdiff -u -r1.61 -r1.61.14.1 src/sys/dev/wscons/wsksymdef.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.30 src/sys/dev/wscons/wsemul_vt100.c:1.30.70.1
--- src/sys/dev/wscons/wsemul_vt100.c:1.30 Thu Nov 16 01:33:31 2006
+++ src/sys/dev/wscons/wsemul_vt100.c Wed Mar 21 21:27:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.30 2006/11/16 01:33:31 christos Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.30.70.1 2012/03/21 21:27:42 jdc Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.30 2006/11/16 01:33:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.30.70.1 2012/03/21 21:27:42 jdc Exp $");
#include "opt_wsmsgattrs.h"
@@ -662,7 +662,7 @@ wsemul_vt100_output_scs96(struct wsemul_
int nrc;
switch (c) {
- case '%': /* probably portugese */
+ case '%': /* probably portuguese */
newstate = VT100_EMUL_STATE_SCS96_PERCENT;
break;
case 'A': /* ISO-latin-1 supplemental */
@@ -713,7 +713,7 @@ static u_int
wsemul_vt100_output_scs96_percent(struct wsemul_vt100_emuldata *edp, u_char c)
{
switch (c) {
- case '6': /* portugese */
+ case '6': /* portuguese */
vt100_setnrc(edp, 8);
break;
default:
Index: src/sys/dev/wscons/wsemul_vt100_chars.c
diff -u src/sys/dev/wscons/wsemul_vt100_chars.c:1.11 src/sys/dev/wscons/wsemul_vt100_chars.c:1.11.92.1
--- src/sys/dev/wscons/wsemul_vt100_chars.c:1.11 Sun Dec 11 12:24:12 2005
+++ src/sys/dev/wscons/wsemul_vt100_chars.c Wed Mar 21 21:27:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_chars.c,v 1.11 2005/12/11 12:24:12 christos Exp $ */
+/* $NetBSD: wsemul_vt100_chars.c,v 1.11.92.1 2012/03/21 21:27:42 jdc Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_chars.c,v 1.11 2005/12/11 12:24:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_chars.c,v 1.11.92.1 2012/03/21 21:27:42 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@ static const struct {
/* norwegian /danish */
{{0x0023, 0x0040, 0x00c6, 0x00d8, 0x00c5, 0x005e,
0x005f, 0x0060, 0x00e6, 0x00f8, 0x00e5, 0x007e}},
- /* portugese */
+ /* portuguese */
{{0x0023, 0x0040, 0x00c3, 0x00c7, 0x00d5, 0x005e,
0x005f, 0x0060, 0x00e3, 0x00e7, 0x00f5, 0x007e}},
/* spanish */
Index: src/sys/dev/wscons/wsksymdef.h
diff -u src/sys/dev/wscons/wsksymdef.h:1.61 src/sys/dev/wscons/wsksymdef.h:1.61.14.1
--- src/sys/dev/wscons/wsksymdef.h:1.61 Wed May 21 07:39:24 2008
+++ src/sys/dev/wscons/wsksymdef.h Wed Mar 21 21:27:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wsksymdef.h,v 1.61 2008/05/21 07:39:24 ghen Exp $ */
+/* $NetBSD: wsksymdef.h,v 1.61.14.1 2012/03/21 21:27:42 jdc Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -590,7 +590,7 @@ action(KB_IT, 0, 0x0500, "it", , "Italia
action(KB_JP, 0, 0x0800, "jp", , "Japanese") \
action(KB_NO, 0, 0x0a00, "no", , "Norwegian") \
action(KB_PL, 0, 0x0d00, "pl", , "Polish") \
-action(KB_PT, 0, 0x1100, "pt", , "Portugese") \
+action(KB_PT, 0, 0x1100, "pt", , "Portuguese") \
action(KB_RU, 0, 0x0e00, "ru", , "Russian") \
action(KB_ES, 0, 0x0b00, "es", , "Spanish") \
action(KB_SV, 0, 0x0900, "sv", , "Swedish") \
