Changeset 290 for trunk/VSlickMacros/kdev.e

Timestamp:

May 23, 2005, 2:19:39 AM (20 years ago)

Author:

bird

Message:

Some emacs fixes.

File:

• trunk/VSlickMacros/kdev.e (modified) (3 diffs)

trunk/VSlickMacros/kdev.e

@@ -2323 +2323 @@
     if (sVar == '' || sVal == '')
         return -1;
-    //say 'k_style_emacs_var: 'sVar'='sVal;
-    //say 'p_extension='p_extension' p_mode_name='p_mode_name;
-
-
-    /* prepare style changes (C) */
+    say 'k_style_emacs_var: 'sVar'='sVal;
+
+    /* 
+     * Unpack the mode style parameters.
+     */
     _str sStyle = name_info(_edit_window().p_index);
-    typeless iIndentAmount, fExpansion, iMinAbbrivation, fIndentAfterOpenParen, iBeginEndStyle, fIndent1stLevel, iMainStyle, iSwitchStyle, sRest;
-    parse sStyle with iIndentAmount fExpansion iMinAbbrivation fIndentAfterOpenParen iBeginEndStyle fIndent1stLevel iMainStyle iSwitchStyle sRest;
-
-    /* process the variable. */
+    _str sStyleName = p_mode_name;
+    typeless iIndentAmount, fExpansion, iMinAbbrivation, fIndentAfterOpenParen, iBeginEndStyle, fIndent1stLevel, iMainStyle, iSwitchStyle, 
+             sRest, sRes0, sRes1;
+    if (sStyleName == 'Slick-C')
+    {
+         parse sStyle with iMinAbbrivation sRes0 iBeginEndStyle fIndent1stLevel sRes1 iSwitchStyle sRest;
+         iIndentAmount = p_SyntaxIndent;
+    }
+    else /* C */
+         parse sStyle with iIndentAmount fExpansion iMinAbbrivation fIndentAfterOpenParen iBeginEndStyle fIndent1stLevel iMainStyle iSwitchStyle sRest;
+
+
+    /* 
+     * Process the variable. 
+     */
     switch (sVar)
     {
@@ -2415 +2426 @@
             break;
 
+        case 'c-label-offset':
+        {
+            int i = k_style_emacs_var_integer(sVal);
+            if (i >= -16 && i <= 16)
+            {
+                if (i == -p_SyntaxIndent)
+                    iSwitchStyle = 0;
+                else
+                    iSwitchStyle = 1;
+            }
+            break;
+        }
+
+
         case 'indent-tabs-mode':
             p_indent_with_tabs = sVal == 't';
@@ -2454 +2479 @@
     }
 
-    /* change the style? (C only) */
-    if (p_mode_name == 'C')
-    {
-        _str sNewStyle = iIndentAmount' 'fExpansion' 'iMinAbbrivation' 'fIndentAfterOpenParen' 'iBeginEndStyle' 'fIndent1stLevel' 'iMainStyle' 'iSwitchStyle' 'sRest;
-        if (sNewStyle != sStyle)
-        {
-            //say '   sStyle='sStyle;
-            //say 'sNewStyle='sNewStyle;
-            set_name_info(_edit_window().p_index, sNewStyle);
-        }
+    /* 
+     * Update the style? 
+     */
+    _str sNewStyle = "";
+    if (sStyleName == 'Slick-C')
+        sNewStyle = iMinAbbrivation' 'sRes0' 'iBeginEndStyle' 'fIndent1stLevel' 'sRes1' 'iSwitchStyle' 'sRest;
+    else
+        sNewStyle = iIndentAmount' 'fExpansion' 'iMinAbbrivation' 'fIndentAfterOpenParen' 'iBeginEndStyle' 'fIndent1stLevel' 'iMainStyle' 'iSwitchStyle' 'sRest;
+    if (   sNewStyle != ""
+        && sNewStyle != sStyle
+        && sStyleName == p_mode_name)
+    {
+        //say '   sStyle='sStyle' p_mode_name='p_mode_name;
+        //say 'sNewStyle='sNewStyle;
+        set_name_info(_edit_window().p_index, sNewStyle);
     }