Changeset 3146 for trunk/SlickEdit

Timestamp:

Mar 15, 2018, 6:01:15 PM (7 years ago)

Author:

bird

Message:

Slickedit/k*.e: updates

Location:

trunk/SlickEdit

Files:

• kdev.e (modified) (3 diffs)
• kkeys.e (modified) (2 diffs)

trunk/SlickEdit/kdev.e

@@ -3565 +3565 @@
      * Load the color profile (was lexer).
      */
-    cload(_strip_filename(__FILE__, 'N') '/user.vlx');
+    int rc = cload(_strip_filename(__FILE__, 'N') '/user.vlx');
+    if (rc != 0)
+        messageNwait('cload of user.vlx failed: ' rc);
 #endif
 
@@ -3576 +3578 @@
     def_mfsearch_init_flags = 2 | 4;    /* MFSEARCH_INIT_CURWORD | MFSEARCH_INIT_SELECTION */
     def_line_insert = 'B';              /* insert before */
+    def_updown_col=0;                   /* cursor movement */
+    def_cursorwrap=0;                   /* ditto. */
+    def_click_past_end=1;               /* ditto */
+    def_start_on_first=1;               /* vs A B C; view A. */
+    def_vc_system='Subversion'          /* svn is default version control */
+#if __VERSION__ >= 16.0
+    def_auto_unsurround_block=0;        /* Delete line, not block. */
+#endif
+    _config_modify_flags(CFGMODIFY_DEFDATA);
+
+#if __VERSION__ < 21.0 /* I think this is obsolete... */
     def_file_types='All Files (*),'     /** @todo make this prettier */
                    'C/C++ Files (*.c;*.cc;*.cpp;*.cp;*.cxx;*.c++;*.h;*.hh;*.hpp;*.hxx;*.inl;*.xpm),'
@@ -3619 +3632 @@
                    'Erlang Files (*.erl;*.hrl),'
                    ;
-
-    def_updown_col=0;                   /* cursor movement */
-    def_cursorwrap=0;                   /* ditto. */
-    def_click_past_end=1;               /* ditto */
-    def_start_on_first=1;               /* vs A B C; view A. */
-    def_vc_system='Subversion'          /* svn is default version control */
-#if __VERSION__ >= 16.0
-    def_auto_unsurround_block=0;        /* Delete line, not block. */
 #endif
-    _config_modify_flags(CFGMODIFY_DEFDATA);
 
     /* Make it grok:  # include <stuff.h> */

trunk/SlickEdit/kkeys.e

@@ -53 +53 @@
 #if __VERSION__ >= 15.0
 def  'S-C-='    = svn_diff_with_base
+#endif
+#if __VERSION__ >= 22.0
+def  'C-='      = diff;
+def  'C--'      = nil;
+def  'S-A-C-='  = wfont_zoom_in;
+def  'S-A-C--'  = wfont_zoom_out;
 #endif
 #if __VERSION__ >= 14.0
@@ -80 +86 @@
 def  'S-M-U'    = kkeys_gen_uuid
 #endif
+#if __VERSION__ >= 22.0
+def  'S-M-C-='  = wfont_zoom_in;
+def  'S-M-C--'  = wfont_zoom_out;
+#endif
 /* Fixing brainfucked slickedit silliness: */
 def  'M-v'      = paste