Merge from trunk.

2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 80b970ac02f..6a3638c4232 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-13  Chris Newton  <redshodan@gmail.com>  (tiny change)
+
+        * url-http.el (url-http): Copy over `url-show-status' to the async
+        buffer so that `url-display-percentage' does the right thing
+        (bug#4680).
+
 2011-07-06  Nick Dokos  <nicholas.dokos@hp.com>  (tiny change)
 
         * url-cache.el (url-cache-extract): Set buffer multibyte flag to
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 7e8b0d958cc..def35449397 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1172,6 +1172,7 @@ CBARGS as the arguments."
                     url-http-after-change-function
                     url-callback-function
                     url-callback-arguments
+                    url-show-status
                     url-http-method
                     url-http-extra-headers
                     url-http-data
@@ -1206,6 +1207,7 @@ CBARGS as the arguments."
                        url-http-chunked-start
                        url-callback-function
                        url-callback-arguments
+                       url-show-status
                        url-http-process
                        url-http-method
                        url-http-extra-headers