BSD 4_3_Tahoe release

[unix-history] / usr / src / ucb / window / char.h

diff --git a/usr/src/ucb/window/char.h b/usr/src/ucb/window/char.h
index 7e3dfd9..7a8520a 100644 (file)
--- a/usr/src/ucb/window/char.h
+++ b/usr/src/ucb/window/char.h
@@ -1,11 +1,20 @@
 /*
 /*

- * @(#)char.h  3.3 4/24/85
- */
-
-/*
- * Copyright (c) 1983 Regents of the University of California,
- * All rights reserved.  Redistribution permitted subject to
- * the terms of the Berkeley Software License Agreement.
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)char.h      3.6 (Berkeley) 6/29/88

  */
 
 /*
  */
 
 /*


@@ -23,7 +32,7 @@
 
 char *_unctrl[];
 char _cmap[];
 
 char *_unctrl[];
 char _cmap[];

-#define ctrl(c)                ('c' & 0x1f)
+#define ctrl(c)                (c & 0x1f)

 #define unctrl(c)      (_unctrl[(unsigned char) (c)])
 #define _C             0x01
 #define _P             0x02
 #define unctrl(c)      (_unctrl[(unsigned char) (c)])
 #define _C             0x01
 #define _P             0x02