Index: /trunk/SlickEdit/kdev.e
===================================================================
--- /trunk/SlickEdit/kdev.e	(revision 3014)
+++ /trunk/SlickEdit/kdev.e	(revision 3015)
@@ -2447,4 +2447,9 @@
         return -1;
     //say 'k_style_emacs_var: 'sVar'='sVal;
+
+#if __VERSION__ >= 21.0
+    /** @todo figure out p_index. */
+    return 0;
+#else
 
     /*
@@ -2805,4 +2810,5 @@
 
     return 0;
+#endif
 }
 
@@ -3571,4 +3577,8 @@
 
         /* C/C++ setup, wrap at column 80 not 64. */
+# if __VERSION__ >= 21.0
+        if (_LangGetPropertyInt32(sLangId, VSLANGPROPNAME_CW_FIXED_RIGHT_COLUMN) < 80)
+            _LangSetPropertyInt32(sLangId, VSLANGPROPNAME_CW_FIXED_RIGHT_COLUMN, 80);
+# else
         sTmp = LanguageSettings.getCommentWrapOptions(sLangId);
         if (length(sTmp) > 10)
@@ -3582,4 +3592,5 @@
             //replace_def_data("def-comment-wrap-c",'1 1 0 1 1 80 0 0 80 0 80 0 80 0 0 1 '); - enable block comment wrap.
         }
+# endif
 
         /* set the encoding to UTF-8 without any friggin useless signatures. */
Index: /trunk/SlickEdit/kkeys.e
===================================================================
--- /trunk/SlickEdit/kkeys.e	(revision 3014)
+++ /trunk/SlickEdit/kkeys.e	(revision 3015)
@@ -300,4 +300,5 @@
       {
 
+# if __VERSION__ < 21.0 /** @todo fix me? */
          /* HACK ALERT: Make sure gtag_filelist_last_ext has the right value. */
          _update_tag_filelist_ext(sLangId);
@@ -310,12 +311,15 @@
          gtag_filelist_ext._makeempty();
          gtag_filelist_ext[0] = sProjTagFile;
-         saved_gtag_filelist_cache_updated = true;
+         gtag_filelist_cache_updated = true;
+# endif
 
          /* Do the reference searching. */
          push_ref('-e ' :+ sLangId);
 
+# if __VERSION__ < 21.0
          /* restore*/
          gtag_filelist_cache_updated = saved_gtag_filelist_cache_updated;
          gtag_filelist_ext           = saved_gtag_filelist_ext;
+# endif
       }
       else