Index: edif.c
===================================================================
--- edif.c	(revision 3215)
+++ edif.c	(revision 3216)
@@ -4429,7 +4429,7 @@
  *	strings must be in lower case.
  */
 typedef struct Token {
-  char *Name;			/* token name */
+  const char *Name;			/* token name */
   int Code;			/* '%token' value */
   struct Token *Next;		/* hash table linkage */
 } Token;
@@ -4559,7 +4559,7 @@
  *	must be lower case.
  */
 typedef struct Context {
-  char *Name;			/* keyword name */
+  const char *Name;			/* keyword name */
   short Code;			/* '%token' value */
   short Flags;			/* special operation flags */
   struct ContextCar *Context;	/* contexts which can be moved to */
@@ -5546,7 +5546,7 @@
  */
 typedef struct Keyword {
   struct Keyword *Next;	 	/* pointer to next entry */
-  char *String;			/* pointer to associated string */
+  const char *String;			/* pointer to associated string */
 } Keyword;
 #define	KEYWORD_HASH	127	/* hash table size */
 static Keyword *KeywordTable[KEYWORD_HASH];
@@ -5555,7 +5555,7 @@
  *
  *	  The passed string is entered into the keyword hash table.
  */
-static void EnterKeyword(char * str)
+static void EnterKeyword(const char * str)
 {
   /*
    *	Locals.
@@ -5562,7 +5562,7 @@
    */
   register Keyword *key;
   register unsigned int hsh;
-  register char *cp;
+  register const char *cp;
   /*
    *	Create the hash code, and add an entry to the table.
    */
@@ -5580,7 +5580,7 @@
  *	is real useful for doing string comparisons by pointer value later.
  *	If there is no match, a NULL is returned.
  */
-static char *FindKeyword(char * str)
+static const char *FindKeyword(const char * str)
 {
   /*
    *	Locals.
@@ -5965,7 +5965,7 @@
  *	list to see if it is enabled. If so the token value is returned,
  *	if not then zero.
  */
-static int MatchToken(register char * str)
+static int MatchToken(register const char * str)
 {
   /*
    *	Locals.
@@ -5993,7 +5993,7 @@
  *	  If the passed keyword string is within the current context, the
  *	new context is pushed and token value is returned. A zero otherwise.
  */
-static int MatchContext(register char * str)
+static int MatchContext(register const char * str)
 {
   /*
    *	Locals.
Index: edif.y
===================================================================
--- edif.y	(revision 3215)
+++ edif.y	(revision 3216)
@@ -2639,7 +2639,7 @@
  *	strings must be in lower case.
  */
 typedef struct Token {
-  char *Name;			/* token name */
+  const char *Name;			/* token name */
   int Code;			/* '%token' value */
   struct Token *Next;		/* hash table linkage */
 } Token;
@@ -2769,7 +2769,7 @@
  *	must be lower case.
  */
 typedef struct Context {
-  char *Name;			/* keyword name */
+  const char *Name;			/* keyword name */
   short Code;			/* '%token' value */
   short Flags;			/* special operation flags */
   struct ContextCar *Context;	/* contexts which can be moved to */
@@ -3756,7 +3756,7 @@
  */
 typedef struct Keyword {
   struct Keyword *Next;	 	/* pointer to next entry */
-  char *String;			/* pointer to associated string */
+  const char *String;			/* pointer to associated string */
 } Keyword;
 #define	KEYWORD_HASH	127	/* hash table size */
 static Keyword *KeywordTable[KEYWORD_HASH];
@@ -3765,7 +3765,7 @@
  *
  *	  The passed string is entered into the keyword hash table.
  */
-static void EnterKeyword(char * str)
+static void EnterKeyword(const char * str)
 {
   /*
    *	Locals.
@@ -3772,7 +3772,7 @@
    */
   register Keyword *key;
   register unsigned int hsh;
-  register char *cp;
+  register const char *cp;
   /*
    *	Create the hash code, and add an entry to the table.
    */
@@ -3790,7 +3790,7 @@
  *	is real useful for doing string comparisons by pointer value later.
  *	If there is no match, a NULL is returned.
  */
-static char *FindKeyword(char * str)
+static const char *FindKeyword(const char * str)
 {
   /*
    *	Locals.
@@ -4175,7 +4175,7 @@
  *	list to see if it is enabled. If so the token value is returned,
  *	if not then zero.
  */
-static int MatchToken(register char * str)
+static int MatchToken(register const char * str)
 {
   /*
    *	Locals.
@@ -4203,7 +4203,7 @@
  *	  If the passed keyword string is within the current context, the
  *	new context is pushed and token value is returned. A zero otherwise.
  */
-static int MatchContext(register char * str)
+static int MatchContext(register const char * str)
 {
   /*
    *	Locals.