Changeset 2558 in kBuild for trunk/VSlickMacros

Timestamp:

Feb 13, 2012 12:36:03 PM (13 years ago)

Author:

bird

Message:

kkeys_delete_right fix (again).

File:

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

trunk/VSlickMacros/kkeys.e

@@ -138 +138 @@
    col=p_col;
 
-   /* virtual space hack*/
+   /* virtual space hack */
    keyin(" ");
    left();
@@ -146 +146 @@
    ch = get_text();
    if (ch != ' ' && ch != "\t" && ch != "\r" && ch != "\n")
+   {
+      /* Delete word and any trailing spaces, but stop at new line. */
       delete_word();
 
-   /* delete spaces and newlines until the next word. */
-   ch = get_text();
-   if (ch == ' ' || ch == "\t" || ch == "\r" || ch == "\n")
-   {
+      ch = get_text();
+      if (ch == ' ' || ch == "\t" || ch == "\r" || ch == "\n")
+      {
+         if (search('[ \t]#','r+') == 0)
+         {
+            _nrseek(match_length('s'));
+            _delete_text(match_length());
+         }
+      }
+   }
+   else
+   {
+      /* delete spaces and newlines until the next word. */
       if (search('[ \t\n\r]#','r+') == 0)
       {
@@ -161 +172 @@
    p_col=col
    //retrieve_command_results()
-}
-
-_command kkeys_delete_left()
-{
-   //denne virker ikkje som den skal!!!
-   message "not implemented"
-/*
-   return;
-   col=p_col
-   search('[ \t]#|?|$|^','r-');
-   if ( match_length()&& get_text(1,match_length('s'))=='' )
-   {
-      _nrseek(match_length('s'));
-      _delete_text(match_length());
-   }
-   else
-      delete_word();
-   p_col=col
-*/
 }