* linux-thread-db.c (check_for_thread_db): Return early if we have

[deliverable/binutils-gdb.git] / readline / kill.c

diff --git a/readline/kill.c b/readline/kill.c
index 0b4714fafa802ff2eb788788597b03aca2077eac..1d3254c3275dc62260c1f481355ea70299f9724c 100644 (file)
--- a/readline/kill.c
+++ b/readline/kill.c
@@ -7,7 +7,7 @@
 
    The GNU Readline Library is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public License
 
    The GNU Readline Library is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public License

-   as published by the Free Software Foundation; either version 1, or
+   as published by the Free Software Foundation; either version 2, or

    (at your option) any later version.
 
    The GNU Readline Library is distributed in the hope that it will be
    (at your option) any later version.
 
    The GNU Readline Library is distributed in the hope that it will be


@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,

-   675 Mass Ave, Cambridge, MA 02139, USA. */
+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)


@@ -46,17 +46,8 @@
 #include "readline.h"
 #include "history.h"
 
 #include "readline.h"
 #include "history.h"
 

-extern int _rl_last_command_was_kill;
-extern int rl_editing_mode;
-extern int rl_explicit_arg;
-extern Function *rl_last_func;
-
-extern void _rl_init_argument ();
-extern int _rl_set_mark_at_pos ();
-extern void _rl_fix_point ();
-extern void _rl_abort_internal ();
-
-extern char *xmalloc (), *xrealloc ();
+#include "rlprivate.h"
+#include "xmalloc.h"

 
 /* **************************************************************** */
 /*                                                                 */
 
 /* **************************************************************** */
 /*                                                                 */


@@ -79,6 +70,11 @@ static int rl_kill_index;
 /* How many slots we have in the kill ring. */
 static int rl_kill_ring_length;
 
 /* How many slots we have in the kill ring. */
 static int rl_kill_ring_length;
 

+static int _rl_copy_to_kill_ring PARAMS((char *, int));
+static int region_kill_internal PARAMS((int));
+static int _rl_copy_word_as_kill PARAMS((int, int));
+static int rl_yank_nth_arg_internal PARAMS((int, int, int));
+

 /* How to say that you only want to save a certain amount
    of kill material. */
 int
 /* How to say that you only want to save a certain amount
    of kill material. */
 int


@@ -138,7 +134,7 @@ _rl_copy_to_kill_ring (text, append)
   if (_rl_last_command_was_kill && rl_editing_mode != vi_mode)
     {
       old = rl_kill_ring[slot];
   if (_rl_last_command_was_kill && rl_editing_mode != vi_mode)
     {
       old = rl_kill_ring[slot];

-      new = xmalloc (1 + strlen (old) + strlen (text));
+      new = (char *)xmalloc (1 + strlen (old) + strlen (text));

 
       if (append)
        {
 
       if (append)
        {


@@ -205,18 +201,21 @@ int
 rl_kill_word (count, key)
      int count, key;
 {
 rl_kill_word (count, key)
      int count, key;
 {

-  int orig_point = rl_point;
+  int orig_point;

 
   if (count < 0)
     return (rl_backward_kill_word (-count, key));
   else
     {
 
   if (count < 0)
     return (rl_backward_kill_word (-count, key));
   else
     {

+      orig_point = rl_point;

       rl_forward_word (count, key);
 
       if (rl_point != orig_point)
        rl_kill_text (orig_point, rl_point);
 
       rl_point = orig_point;
       rl_forward_word (count, key);
 
       if (rl_point != orig_point)
        rl_kill_text (orig_point, rl_point);
 
       rl_point = orig_point;

+      if (rl_editing_mode == emacs_mode)
+       rl_mark = rl_point;

     }
   return 0;
 }
     }
   return 0;
 }


@@ -226,16 +225,20 @@ int
 rl_backward_kill_word (count, ignore)
      int count, ignore;
 {
 rl_backward_kill_word (count, ignore)
      int count, ignore;
 {

-  int orig_point = rl_point;
+  int orig_point;

 
   if (count < 0)
     return (rl_kill_word (-count, ignore));
   else
     {
 
   if (count < 0)
     return (rl_kill_word (-count, ignore));
   else
     {

+      orig_point = rl_point;

       rl_backward_word (count, ignore);
 
       if (rl_point != orig_point)
        rl_kill_text (orig_point, rl_point);
       rl_backward_word (count, ignore);
 
       if (rl_point != orig_point)
        rl_kill_text (orig_point, rl_point);

+
+      if (rl_editing_mode == emacs_mode)
+       rl_mark = rl_point;

     }
   return 0;
 }
     }
   return 0;
 }


@@ -246,16 +249,19 @@ int
 rl_kill_line (direction, ignore)
      int direction, ignore;
 {
 rl_kill_line (direction, ignore)
      int direction, ignore;
 {

-  int orig_point = rl_point;
+  int orig_point;

 
   if (direction < 0)
     return (rl_backward_kill_line (1, ignore));
   else
     {
 
   if (direction < 0)
     return (rl_backward_kill_line (1, ignore));
   else
     {

+      orig_point = rl_point;

       rl_end_of_line (1, ignore);
       if (orig_point != rl_point)
        rl_kill_text (orig_point, rl_point);
       rl_point = orig_point;
       rl_end_of_line (1, ignore);
       if (orig_point != rl_point)
        rl_kill_text (orig_point, rl_point);
       rl_point = orig_point;

+      if (rl_editing_mode == emacs_mode)
+       rl_mark = rl_point;

     }
   return 0;
 }
     }
   return 0;
 }


@@ -266,18 +272,22 @@ int
 rl_backward_kill_line (direction, ignore)
      int direction, ignore;
 {
 rl_backward_kill_line (direction, ignore)
      int direction, ignore;
 {

-  int orig_point = rl_point;
+  int orig_point;

 
   if (direction < 0)
     return (rl_kill_line (1, ignore));
   else
     {
       if (!rl_point)
 
   if (direction < 0)
     return (rl_kill_line (1, ignore));
   else
     {
       if (!rl_point)

-       ding ();
+       rl_ding ();

       else
        {
       else
        {

+         orig_point = rl_point;

          rl_beg_of_line (1, ignore);
          rl_beg_of_line (1, ignore);

-         rl_kill_text (orig_point, rl_point);
+         if (rl_point != orig_point)
+           rl_kill_text (orig_point, rl_point);
+         if (rl_editing_mode == emacs_mode)
+           rl_mark = rl_point;

        }
     }
   return 0;
        }
     }
   return 0;


@@ -291,6 +301,7 @@ rl_kill_full_line (count, ignore)
   rl_begin_undo_group ();
   rl_point = 0;
   rl_kill_text (rl_point, rl_end);
   rl_begin_undo_group ();
   rl_point = 0;
   rl_kill_text (rl_point, rl_end);

+  rl_mark = 0;

   rl_end_undo_group ();
   return 0;
 }
   rl_end_undo_group ();
   return 0;
 }


@@ -308,7 +319,7 @@ rl_unix_word_rubout (count, key)
   int orig_point;
 
   if (rl_point == 0)
   int orig_point;
 
   if (rl_point == 0)

-    ding ();
+    rl_ding ();

   else
     {
       orig_point = rl_point;
   else
     {
       orig_point = rl_point;


@@ -325,7 +336,50 @@ rl_unix_word_rubout (count, key)
        }
 
       rl_kill_text (orig_point, rl_point);
        }
 
       rl_kill_text (orig_point, rl_point);

+      if (rl_editing_mode == emacs_mode)
+       rl_mark = rl_point;

     }
     }

+
+  return 0;
+}
+
+/* This deletes one filename component in a Unix pathname.  That is, it
+   deletes backward to directory separator (`/') or whitespace.  */
+int
+rl_unix_filename_rubout (count, key)
+     int count, key;
+{
+  int orig_point, c;
+
+  if (rl_point == 0)
+    rl_ding ();
+  else
+    {
+      orig_point = rl_point;
+      if (count <= 0)
+       count = 1;
+
+      while (count--)
+       {
+         c = rl_line_buffer[rl_point - 1];
+         while (rl_point && (whitespace (c) || c == '/'))
+           {
+             rl_point--;
+             c = rl_line_buffer[rl_point - 1];
+           }
+
+         while (rl_point && (whitespace (c) == 0) && c != '/')
+           {
+             rl_point--;
+             c = rl_line_buffer[rl_point - 1];
+           }
+       }
+
+      rl_kill_text (orig_point, rl_point);
+      if (rl_editing_mode == emacs_mode)
+       rl_mark = rl_point;
+    }
+

   return 0;
 }
 
   return 0;
 }
 


@@ -340,11 +394,13 @@ rl_unix_line_discard (count, key)
      int count, key;
 {
   if (rl_point == 0)
      int count, key;
 {
   if (rl_point == 0)

-    ding ();
+    rl_ding ();

   else
     {
       rl_kill_text (rl_point, 0);
       rl_point = 0;
   else
     {
       rl_kill_text (rl_point, 0);
       rl_point = 0;

+      if (rl_editing_mode == emacs_mode)
+       rl_mark = rl_point;

     }
   return 0;
 }
     }
   return 0;
 }


@@ -357,17 +413,14 @@ region_kill_internal (delete)
 {
   char *text;
 
 {
   char *text;
 

-  if (rl_mark == rl_point)
+  if (rl_mark != rl_point)

     {
     {

-      _rl_last_command_was_kill++;
-      return 0;
+      text = rl_copy_text (rl_point, rl_mark);
+      if (delete)
+       rl_delete_text (rl_point, rl_mark);
+      _rl_copy_to_kill_ring (text, rl_point < rl_mark);

     }
 
     }
 

-  text = rl_copy_text (rl_point, rl_mark);
-  if (delete)
-    rl_delete_text (rl_point, rl_mark);
-  _rl_copy_to_kill_ring (text, rl_point < rl_mark);
-

   _rl_last_command_was_kill++;
   return 0;
 }
   _rl_last_command_was_kill++;
   return 0;
 }


@@ -385,10 +438,12 @@ int
 rl_kill_region (count, ignore)
      int count, ignore;
 {
 rl_kill_region (count, ignore)
      int count, ignore;
 {

-  int r;
+  int r, npoint;

 
 

+  npoint = (rl_point < rl_mark) ? rl_point : rl_mark;

   r = region_kill_internal (1);
   _rl_fix_point (1);
   r = region_kill_internal (1);
   _rl_fix_point (1);

+  rl_point = npoint;

   return r;
 }
 
   return r;
 }
 


@@ -503,7 +558,9 @@ rl_yank_nth_arg_internal (count, ignore, history_skip)
 {
   register HIST_ENTRY *entry;
   char *arg;
 {
   register HIST_ENTRY *entry;
   char *arg;

-  int i;
+  int i, pos;
+
+  pos = where_history ();

 
   if (history_skip)
     {
 
   if (history_skip)
     {


@@ -512,30 +569,26 @@ rl_yank_nth_arg_internal (count, ignore, history_skip)
     }
 
   entry = previous_history ();
     }
 
   entry = previous_history ();

-  if (entry)
-    {
-      if (history_skip)
-       {
-         for (i = 0; i < history_skip; i++)
-           next_history ();
-       }
-      next_history ();
-    }
-  else
+
+  history_set_pos (pos);
+
+  if (entry == 0)

     {
     {

-      ding ();
+      rl_ding ();

       return -1;
     }
 
   arg = history_arg_extract (count, count, entry->line);
   if (!arg || !*arg)
     {
       return -1;
     }
 
   arg = history_arg_extract (count, count, entry->line);
   if (!arg || !*arg)
     {

-      ding ();
+      rl_ding ();

       return -1;
     }
 
   rl_begin_undo_group ();
 
       return -1;
     }
 
   rl_begin_undo_group ();
 

+  _rl_set_mark_at_pos (rl_point);
+

 #if defined (VI_MODE)
   /* Vi mode always inserts a space before yanking the argument, and it
      inserts it right *after* rl_point. */
 #if defined (VI_MODE)
   /* Vi mode always inserts a space before yanking the argument, and it
      inserts it right *after* rl_point. */


@@ -603,7 +656,7 @@ rl_yank_last_arg (count, key)
 }
 
 /* A special paste command for users of Cygnus's cygwin32. */
 }
 
 /* A special paste command for users of Cygnus's cygwin32. */

-#if defined (__CYGWIN32__)
+#if defined (__CYGWIN__)

 #include <windows.h>
 
 int
 #include <windows.h>
 
 int


@@ -623,12 +676,13 @@ rl_paste_from_clipboard (count, key)
       if (ptr)
        {
          len = ptr - data;
       if (ptr)
        {
          len = ptr - data;

-         ptr = xmalloc (len + 1);
+         ptr = (char *)xmalloc (len + 1);

          ptr[len] = '\0';
          strncpy (ptr, data, len);
        }
       else
         ptr = data;
          ptr[len] = '\0';
          strncpy (ptr, data, len);
        }
       else
         ptr = data;

+      _rl_set_mark_at_pos (rl_point);

       rl_insert_text (ptr);
       if (ptr != data)
        free (ptr);
       rl_insert_text (ptr);
       if (ptr != data)
        free (ptr);


@@ -636,4 +690,4 @@ rl_paste_from_clipboard (count, key)
     }
   return (0);
 }
     }
   return (0);
 }

-#endif /* __CYGWIN32__ */
+#endif /* __CYGWIN__ */