X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=ckcasc.h;h=68cd2f711226416b5c274e260bc028e7fe71928d;hb=f8f3c6ea3c71351899c834c2d2a821ee20f62aaf;hp=c7c32cc55b7073c0fbb8eb3c423478c531fe8e07;hpb=8d5a97cca5dc3d41681e7a2dd709ac0ea93e73c5;p=ckermit.git

diff --git a/ckcasc.h b/ckcasc.h
index c7c32cc..68cd2f7 100644
--- a/ckcasc.h
+++ b/ckcasc.h
@@ -6,7 +6,7 @@
   Author: Frank da Cruz (fdc@columbia.edu).
   Columbia University Academic Information Systems, New York City.
 
-  Copyright (C) 1985, 2004,
+  Copyright (C) 1985, 2009,
     Trustees of Columbia University in the City of New York.
     All rights reserved.  See the C-Kermit COPYING.TXT file or the
     copyright text in the ckcmai.c module for disclaimer and permissions.
@@ -42,7 +42,7 @@
 #define SYN   22        /* SYN, Ctrl-V */
 #define ETB   23        /* Ctrl-W */
 #define CAN   24        /* CAN, Ctrl-X */
-#define EM    25        /* Ctrl-Y */
+#define XEM   25        /* Ctrl-Y (was EM but conflicts with OpenSSL) */
 #define SUB   26        /* SUB Ctrl-Z */
 #define ESC   27        /* Escape Ctrl-[ */
 #define XFS   28        /* Field Separator,  Ctrl-Backslash */