Changeset 3253 for trunk

Timestamp:

Apr 30, 2007, 1:18:41 AM (18 years ago)

Author:

bird

Message:

Applied readline-51-001

Location:

trunk/essentials/app-shells/bash/lib/readline

Files:

• readline.c (modified) (1 diff)
• text.c (modified) (3 diffs)

trunk/essentials/app-shells/bash/lib/readline/readline.c

@@ -720 +720 @@
           rl_dispatching = 1;
           RL_SETSTATE(RL_STATE_DISPATCHING);
-          r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
+          (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
           RL_UNSETSTATE(RL_STATE_DISPATCHING);
           rl_dispatching = 0;

trunk/essentials/app-shells/bash/lib/readline/text.c

@@ -1072 +1072 @@
      int count, key;
 {
-  int r;
-
   if (count < 0)
     return (_rl_rubout_char (-count, key));
@@ -1091 +1089 @@
         rl_forward_byte (count, key);
 
-      r = rl_kill_text (orig_point, rl_point);
+      rl_kill_text (orig_point, rl_point);
       rl_point = orig_point;
-      return r;
     }
   else
@@ -1100 +1097 @@
 
       new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
-      return (rl_delete_text (rl_point, new_point));
-    }
+      rl_delete_text (rl_point, new_point);
+    }
+  return 0;
 }