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.

30 lines
847 B

  1. From 71607715f11c9875a5aaaf3240885c45f79138e9 Mon Sep 17 00:00:00 2001
  2. From: Andreas Gruenbacher <agruen@gnu.org>
  3. Date: Fri, 17 Aug 2018 13:35:40 +0200
  4. Subject: [PATCH] Fix swapping fake lines in pch_swap
  5. * src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
  6. blank line in the middle of a context-diff hunk: that empty line stays
  7. in the middle of the hunk and isn't swapped.
  8. Fixes: https://savannah.gnu.org/bugs/index.php?53133
  9. ---
  10. src/pch.c | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. diff --git a/src/pch.c b/src/pch.c
  13. index 4fd5a05..b0dd14d 100644
  14. --- a/src/pch.c
  15. +++ b/src/pch.c
  16. @@ -2115,7 +2115,7 @@ pch_swap (void)
  17. }
  18. if (p_efake >= 0) { /* fix non-freeable ptr range */
  19. if (p_efake <= i)
  20. - n = p_end - i + 1;
  21. + n = p_end - p_ptrn_lines;
  22. else
  23. n = -i;
  24. p_efake += n;
  25. --
  26. 2.19.1