[Emacs-diffs] master 816c1df 3/3: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Alan Mackenzie]

branch: master
commit 816c1dfc5dfc6d490c653b393ef6876b3f04b7fe
Merge: 436b88b e2815bf
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/ChangeLog  |    4 ++++
 lisp/net/shr.el |   16 +++++++++-------
 src/ChangeLog   |    8 ++++++++
 src/fileio.c    |   13 +++++++++----
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a0d518..364511c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-15  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/shr.el (shr-fold-text): Don't bug out on zero-length text.
+
 2014-12-14  Alan Mackenzie  <address@hidden>
 
        * lisp/cus-start.el (all): Add fast-but-imprecise-scrolling.
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 6e06a76..387bb02 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -414,13 +414,15 @@ size, and full-buffer size."
           (cdr (assq 'background-color shr-stylesheet))))))))
 
 (defun shr-fold-text (text)
-  (with-temp-buffer
-    (let ((shr-indentation 0)
-         (shr-state nil)
-         (shr-start nil)
-         (shr-internal-width (window-width)))
-      (shr-insert text)
-      (buffer-string))))
+  (if (zerop (length text))
+      text
+    (with-temp-buffer
+      (let ((shr-indentation 0)
+           (shr-state nil)
+           (shr-start nil)
+           (shr-internal-width (window-width)))
+       (shr-insert text)
+       (buffer-string)))))
 
 (define-inline shr-char-breakable-p (char)
   "Return non-nil if a line can be broken before and after CHAR."
diff --git a/src/ChangeLog b/src/ChangeLog
index 46bf280..5ce56f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-15  Paul Eggert  <address@hidden>
+
+       Correct same_at_end when restoring window points
+       * fileio.c (Finsert_file_contents): Compute same_at_end character
+       position using the old buffer size, not the new one, since
+       restore_window_points wants the old size.
+       Fixes: debbugs:19161
+
 2014-12-14  Alan Mackenzie  <address@hidden>
 
        New feature optionally to accelerate auto-repeated scrolling.
diff --git a/src/fileio.c b/src/fileio.c
index 83b4954..39514ee 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3522,6 +3522,9 @@ by calling `format-decode', which see.  */)
      bytes and BEG and END count bytes.  */
   ptrdiff_t same_at_start = BEGV_BYTE;
   ptrdiff_t same_at_end = ZV_BYTE;
+  /* SAME_AT_END_CHARPOS counts characters, because
+     restore_window_points needs the old character count.  */
+  ptrdiff_t same_at_end_charpos = ZV;
 
   if (current_buffer->base_buffer && ! NILP (visit))
     error ("Cannot do file visiting in an indirect buffer");
@@ -3943,6 +3946,7 @@ by calling `format-decode', which see.  */)
                        + (! NILP (end) ? end_offset : st.st_size) - ZV_BYTE));
          if (overlap > 0)
            same_at_end += overlap;
+         same_at_end_charpos = BYTE_TO_CHAR (same_at_end);
 
          /* Arrange to read only the nonmatching middle part of the file.  */
          beg_offset += same_at_start - BEGV_BYTE;
@@ -3950,7 +3954,7 @@ by calling `format-decode', which see.  */)
 
          invalidate_buffer_caches (current_buffer,
                                    BYTE_TO_CHAR (same_at_start),
-                                   BYTE_TO_CHAR (same_at_end));
+                                   same_at_end_charpos);
          del_range_byte (same_at_start, same_at_end, 0);
          /* Insert from the file at the proper position.  */
          temp = BYTE_TO_CHAR (same_at_start);
@@ -4099,6 +4103,7 @@ by calling `format-decode', which see.  */)
       overlap = same_at_start - BEGV_BYTE - (same_at_end + inserted - ZV_BYTE);
       if (overlap > 0)
        same_at_end += overlap;
+      same_at_end_charpos = BYTE_TO_CHAR (same_at_end);
 
       /* If display currently starts at beginning of line,
         keep it that way.  */
@@ -4114,7 +4119,7 @@ by calling `format-decode', which see.  */)
        {
          invalidate_buffer_caches (current_buffer,
                                    BYTE_TO_CHAR (same_at_start),
-                                   BYTE_TO_CHAR (same_at_end));
+                                   same_at_end_charpos);
          del_range_byte (same_at_start, same_at_end, 0);
          temp = GPT;
          eassert (same_at_start == GPT_BYTE);
@@ -4122,7 +4127,7 @@ by calling `format-decode', which see.  */)
        }
       else
        {
-         temp = BYTE_TO_CHAR (same_at_start);
+         temp = same_at_end_charpos;
        }
       /* Insert from the file at the proper position.  */
       SET_PT_BOTH (temp, same_at_start);
@@ -4405,7 +4410,7 @@ by calling `format-decode', which see.  */)
   if (inserted > 0)
     restore_window_points (window_markers, inserted,
                           BYTE_TO_CHAR (same_at_start),
-                          BYTE_TO_CHAR (same_at_end));
+                          same_at_end_charpos);
 
   if (!NILP (visit))
     {