merge from trunk

4 files changed, 17 insertions, 5 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2346803c6bf..52a69690534 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-parse-headers): Always place point at the
+        start of the buffer instead of just 80% of the time.
+
 2013-08-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * url-http.el (url-handle-content-transfer-encoding): Renamed
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 07049591cf0..7047e6b5f13 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -855,6 +855,7 @@ should be shown to the user."
       (url-handle-content-transfer-encoding))
     (url-http-debug "Finished parsing HTTP headers: %S" success)
     (widen)
+    (goto-char (point-min))
     success))
 
 (defun url-handle-content-transfer-encoding ()
diff --git a/src/ChangeLog b/src/ChangeLog
index c8a1de49d68..eeae85a888c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * decompress.c (unwind_decompress): Always restore point.
+
 2013-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xdisp.c (cursor_type_changed): Now static.
diff --git a/src/decompress.c b/src/decompress.c
index c54a34e050e..b4e122c3ba8 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -95,12 +95,14 @@ unwind_decompress (void *ddata)
   struct decompress_unwind_data *data = ddata;
   fn_inflateEnd (data->stream);
 
-  /* Delete any uncompressed data already inserted and restore point.  */
+  /* Delete any uncompressed data already inserted on error.  */
   if (data->start)
-    {
-      del_range (data->start, PT);
-      SET_PT (data->old_point);
-    }
+    del_range (data->start, PT);
+
+  /* Put point where it was, or if the buffer has shrunk because the
+     compressed data is bigger than the uncompressed, at
+     point-max.  */
+  SET_PT (min (data->old_point, ZV));
 }
 
 DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,