Changeset 323 in kBuild for trunk

Timestamp:

Sep 15, 2005 6:27:33 PM (19 years ago)

Author:

bird

Message:

nuke-trailing-whitespace-p

File:

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

trunk/VSlickMacros/kdev.e

@@ -42 +42 @@
  *
  * Ctrl+Shift+T: Update project tagfile.
+ * Ctrl+Shift+L: Load document variables.
  *
  * Ctrl+Shift+B: KLOGENTRYX(..)
@@ -71 +72 @@
 
 //optional stuff
-//def  'C-S-Q' = odin32_klog_file_ask
-//def  'C-S-N' = odin32_klog_file_no_ask
-//def  'C-S-1' = odin32_klogentry
-//def  'C-S-3' = odin32_klogexit
+//def  'C-S-Q' = klib_klog_file_ask
+//def  'C-S-N' = klib_klog_file_no_ask
+//def  'C-S-1' = klib_klogentry
+//def  'C-S-3' = klib_klogexit
 
 
@@ -2325 +2326 @@
     //say 'k_style_emacs_var: 'sVar'='sVal;
 
-    /* 
+    /*
      * Unpack the mode style parameters.
      */
     _str sStyle = name_info(_edit_window().p_index);
     _str sStyleName = p_mode_name;
-    typeless iIndentAmount, fExpansion, iMinAbbrivation, fIndentAfterOpenParen, iBeginEndStyle, fIndent1stLevel, iMainStyle, iSwitchStyle, 
+    typeless iIndentAmount, fExpansion, iMinAbbrivation, fIndentAfterOpenParen, iBeginEndStyle, fIndent1stLevel, iMainStyle, iSwitchStyle,
              sRest, sRes0, sRes1;
     if (sStyleName == 'Slick-C')
@@ -2341 +2342 @@
 
 
-    /* 
-     * Process the variable. 
+    /*
+     * Process the variable.
      */
     switch (sVar)
@@ -2377 +2378 @@
             break;
         }
+/* relevant emacs code:
+(defconst c-style-alist
+  '(("gnu"
+     (c-basic-offset . 2)
+     (c-comment-only-line-offset . (0 . 0))
+     (c-offsets-alist . ((statement-block-intro . +)
+                         (knr-argdecl-intro . 5)
+                         (substatement-open . +)
+                         (label . 0)
+                         (statement-case-open . +)
+                         (statement-cont . +)
+                         (arglist-intro . c-lineup-arglist-intro-after-paren)
+                         (arglist-close . c-lineup-arglist)
+                         (inline-open . 0)
+                         (brace-list-open . +)
+                         ))
+     (c-special-indent-hook . c-gnu-impose-minimum)
+     (c-block-comment-prefix . "")
+     )
+    ("k&r"
+     (c-basic-offset . 5)
+     (c-comment-only-line-offset . 0)
+     (c-offsets-alist . ((statement-block-intro . +)
+                         (knr-argdecl-intro . 0)
+                         (substatement-open . 0)
+                         (label . 0)
+                         (statement-cont . +)
+                         ))
+     )
+    ("bsd"
+     (c-basic-offset . 8)
+     (c-comment-only-line-offset . 0)
+     (c-offsets-alist . ((statement-block-intro . +)
+                         (knr-argdecl-intro . +)
+                         (substatement-open . 0)
+                         (label . 0)
+                         (statement-cont . +)
+                         (inline-open . 0)
+                         (inexpr-class . 0)
+                         ))
+     )
+    ("stroustrup"
+     (c-basic-offset . 4)
+     (c-comment-only-line-offset . 0)
+     (c-offsets-alist . ((statement-block-intro . +)
+                         (substatement-open . 0)
+                         (label . 0)
+                         (statement-cont . +)
+                         ))
+     )
+    ("whitesmith"
+     (c-basic-offset . 4)
+     (c-comment-only-line-offset . 0)
+     (c-offsets-alist . ((knr-argdecl-intro . +)
+                         (label . 0)
+                         (statement-cont . +)
+                         (substatement-open . +)
+                         (block-open . +)
+                         (statement-block-intro . c-lineup-whitesmith-in-block)
+                         (block-close . c-lineup-whitesmith-in-block)
+                         (inline-open . +)
+                         (defun-open . +)
+                         (defun-block-intro . c-lineup-whitesmith-in-block)
+                         (defun-close . c-lineup-whitesmith-in-block)
+                         (brace-list-open . +)
+                         (brace-list-intro . c-lineup-whitesmith-in-block)
+                         (brace-entry-open . c-indent-multi-line-block)
+                         (brace-list-close . c-lineup-whitesmith-in-block)
+                         (class-open . +)
+                         (inclass . c-lineup-whitesmith-in-block)
+                         (class-close . +)
+                         (inexpr-class . 0)
+                         (extern-lang-open . +)
+                         (inextern-lang . c-lineup-whitesmith-in-block)
+                         (extern-lang-close . +)
+                         (namespace-open . +)
+                         (innamespace . c-lineup-whitesmith-in-block)
+                         (namespace-close . +)
+                         ))
+     )
+    ("ellemtel"
+     (c-basic-offset . 3)
+     (c-comment-only-line-offset . 0)
+     (c-hanging-braces-alist     . ((substatement-open before after)))
+     (c-offsets-alist . ((topmost-intro        . 0)
+                         (topmost-intro-cont   . 0)
+                         (substatement         . +)
+                         (substatement-open    . 0)
+                         (case-label           . +)
+                         (access-label         . -)
+                         (inclass              . ++)
+                         (inline-open          . 0)
+                         ))
+     )
+    ("linux"
+     (c-basic-offset  . 8)
+     (c-comment-only-line-offset . 0)
+     (c-hanging-braces-alist . ((brace-list-open)
+                                (brace-entry-open)
+                                (substatement-open after)
+                                (block-close . c-snug-do-while)))
+     (c-cleanup-list . (brace-else-brace))
+     (c-offsets-alist . ((statement-block-intro . +)
+                         (knr-argdecl-intro     . 0)
+                         (substatement-open     . 0)
+                         (label                 . 0)
+                         (statement-cont        . +)
+                         ))
+     )
+    ("python"
+     (indent-tabs-mode . t)
+     (fill-column      . 78)
+     (c-basic-offset   . 8)
+     (c-offsets-alist  . ((substatement-open . 0)
+                          (inextern-lang . 0)
+                          (arglist-intro . +)
+                          (knr-argdecl-intro . +)
+                          ))
+     (c-hanging-braces-alist . ((brace-list-open)
+                                (brace-list-intro)
+                                (brace-list-close)
+                                (brace-entry-open)
+                                (substatement-open after)
+                                (block-close . c-snug-do-while)
+                                ))
+     (c-block-comment-prefix . "")
+     )
+    ("java"
+     (c-basic-offset . 4)
+     (c-comment-only-line-offset . (0 . 0))
+     ;; the following preserves Javadoc starter lines
+     (c-offsets-alist . ((inline-open . 0)
+                         (topmost-intro-cont    . +)
+                         (statement-block-intro . +)
+                         (knr-argdecl-intro     . 5)
+                         (substatement-open     . +)
+                         (label                 . +)
+                         (statement-case-open   . +)
+                         (statement-cont        . +)
+                         (arglist-intro  . c-lineup-arglist-intro-after-paren)
+                         (arglist-close  . c-lineup-arglist)
+                         (access-label   . 0)
+                         (inher-cont     . c-lineup-java-inher)
+                         (func-decl-cont . c-lineup-java-throws)
+                         ))
+     )
+    )
+*/
 
         case 'c-file-style':
@@ -2477 +2626 @@
         }
 
+        case 'nuke-trailing-whitespace-p':
+        {
+            _str sName = 'def-koptions-'p_buf_id;
+            int idx = insert_name(sName, MISC_TYPE, "kstyledoc");
+            if (!idx)
+                idx = find_index(sName, MISC_TYPE);
+            if (idx)
+            {
+                if (sVal == 't')
+                    set_name_info(idx, "saveoptions: +S");
+                else
+                    set_name_info(idx, "saveoptions: -S");
+                say 'sVal=' sVal;
+            }
+            break;
+        }
+
         default:
             message('emacs variable "'sVar'" (value "'sVal'") is unknown to us.');
@@ -2482 +2648 @@
     }
 
-    /* 
-     * Update the style? 
+    /*
+     * Update the style?
      */
     _str sNewStyle = "";
@@ -2497 +2663 @@
         //say '   sStyle='sStyle' p_mode_name='p_mode_name;
         //say 'sNewStyle='sNewStyle' sName='sName;
-        if (pos('kstyledoc-', sName) <= 0) 
+        if (pos('kstyledoc-', sName) <= 0)
         {
             sName = 'def-kstyledoc-'p_buf_id;
@@ -2509 +2675 @@
             }
             //say sName'='idx;
-        }             
+        }
         else
             set_name_info(_edit_window().p_index, sNewStyle);
@@ -2520 +2686 @@
 /**
  * Parses a string with emacs variables.
- * 
- * The variables are separated by new line. Junk at 
+ *
+ * The variables are separated by new line. Junk at
  * the start and end of the line is ignored.
  */
@@ -2536 +2702 @@
         else
             iEnd--;
-        iNext++; 
+        iNext++;
 
         sLine = strip(substr(sVars, 1, iEnd), 'B', " \t\n\r");
@@ -2551 +2717 @@
             //say '4={'pos('S4')','pos('4')',"'substr(sLine,pos('S4'),pos('4'))'"'
             if (rc > 0)
-                k_style_emacs_var(substr(sLine,pos('S1'),pos('1')), 
+                k_style_emacs_var(substr(sLine,pos('S1'),pos('1')),
                                   substr(sLine,pos('S2'),pos('2')));
         }
@@ -2566 +2732 @@
     typeless saved_pos;
     _save_pos2(saved_pos);
-    
+
     int rc;
 
@@ -2594 +2760 @@
 
     _restore_pos2(saved_pos);
+}
+
+
+/**
+ * Callback function for the event of a new buffer.
+ *
+ * This is used to make sure there are no left over per buffer options
+ * hanging around.
+ */
+void _buffer_add_kdev(int buf_id)
+{
+    _str sName = 'def-koptions-'buf_id;
+    int idx = insert_name(sName, MISC_TYPE, "kstyledoc");
+    if (!idx)
+        idx = find_index(sName, MISC_TYPE);
+    if (idx)
+        set_name_info(idx, "");
+    //message("_buffer_add_kdev: " idx);
+}
+
+
+/**
+ * Callback function for the event of quitting a buffer.
+ *
+ * This is used to make sure there are no left over per buffer options
+ * hanging around.
+ */
+void _cbquit2_kdev(int buf_id)
+{
+    _str sName = 'def-koptions-'buf_id;
+    int idx = find_index(sName, MISC_TYPE);
+    if (idx)
+        delete_name(idx);
+    //message("_cbquit2_kdev: " idx " " sName);
+
+    sName = 'def-kstyledoc-'buf_id;
+    idx = find_index(sName, MISC_TYPE);
+    if (idx)
+        delete_name(idx);
+}
+
+
+/**
+ * Called to get save options for the current buffer.
+ *
+ * This requires a modified loadsave.e!
+ */
+_str _buffer_save_kdev(int buf_id)
+{
+    _str sRet = ""
+    _str sName = 'def-koptions-'buf_id;
+    int idx = find_index(sName, MISC_TYPE);
+    if (idx)
+    {
+        _str sOptions = strip(name_info(idx));
+        if (sOptions != "")
+            parse sOptions with . "saveoptions:" sRet .
+        message("_buffer_save_kdev: " idx " " sName " " sOptions);
+    }
+    return sRet;
 }