Changeset 2437 in kBuild for trunk/VSlickMacros

Timestamp:

Mar 28, 2011 7:17:08 PM (14 years ago)

Author:

bird

Message:

kkeys.e: Finally fixed C+Delete to work correctly across newlines.

File:

• trunk/VSlickMacros/kkeys.e (modified) (1 diff)

trunk/VSlickMacros/kkeys.e

@@ -136 +136 @@
 _command kkeys_delete_right()
 {
-   col=p_col
-   search('[ \t]#|?|$|^','r+');
-   if ( match_length()&& get_text(1,match_length('s'))=='' )
-   {
-      _nrseek(match_length('s'));
-      _delete_text(match_length());
-   }
-   else
+   col=p_col;
+
+   /* virtual space hack*/
+   keyin(" ");
+   left();
+   _delete_char();
+
+   /* are we in a word, delete it? */
+   ch = get_text();
+   if (ch != ' ' && ch != "\t" && ch != "\r" && ch != "\n")
       delete_word();
+
+   /* delete spaces and newlines until the next word. */
+   ch = get_text();
+   if (ch == ' ' || ch == "\t" || ch == "\r" || ch == "\n")
+   {
+      if (search('[ \t\n\r]#','r+') == 0)
+      {
+         _nrseek(match_length('s'));
+         _delete_text(match_length());
+      }
+   }
+
    p_col=col
    //retrieve_command_results()
-
 }