mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

73 lines
2.0 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/bash/overwrite-fixes.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
  10. #
  11. # This program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. --- ./lib/readline/text.c.orig 2002-05-30 20:46:13.000000000 +0300
  23. +++ ./lib/readline/text.c 2002-12-21 09:02:22.000000000 +0200
  24. @@ -801,13 +801,10 @@
  25. k = _rl_read_mbstring (c, mbkey, MB_LEN_MAX);
  26. #endif
  27. + rl_begin_undo_group ();
  28. +
  29. for (i = 0; i < count; i++)
  30. {
  31. - rl_begin_undo_group ();
  32. -
  33. - if (rl_point < rl_end)
  34. - rl_delete (1, c);
  35. -
  36. #if defined (HANDLE_MULTIBYTE)
  37. if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
  38. rl_insert_text (mbkey);
  39. @@ -815,9 +812,13 @@
  40. #endif
  41. _rl_insert_char (1, c);
  42. - rl_end_undo_group ();
  43. + if (rl_point < rl_end)
  44. + rl_delete (1, c);
  45. +
  46. }
  47. + rl_end_undo_group ();
  48. +
  49. return 0;
  50. }
  51. @@ -934,10 +935,13 @@
  52. else
  53. rl_delete_text (opoint, rl_point);
  54. - /* Emacs puts point at the beginning of the sequence of spaces. */
  55. - opoint = rl_point;
  56. - _rl_insert_char (l, ' ');
  57. - rl_point = opoint;
  58. + if (rl_point < rl_end)
  59. + {
  60. + /* Emacs puts point at the beginning of the sequence of spaces. */
  61. + opoint = rl_point;
  62. + _rl_insert_char (l, ' ');
  63. + rl_point = opoint;
  64. + }
  65. rl_end_undo_group ();