Merge from emacs-23

[gnu-emacs] / lisp / url / ChangeLog

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index c6f07fec2c0650fcc102df5e4b418a7839cd9ad8..374333150c81aaaa0d4c39d458db10a014fd29a3 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -10,6 +10,33 @@
 
        * Version 23.2 released.
 
+2010-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * url-dired.el (url-dired-minor-mode): Use define-minor-mode.
+
+2010-03-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * url-http.el (url-http-parse-headers): Fix wrong variable name.
+
+2010-03-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * url-http.el (url-http-codes): New variable to hold a mapping of
+       HTTP status codes' numbers, their symbolic name, and their text.
+       (url-http-parse-headers): Use it, leaving the original numeric
+       code in a comment.
+
+2010-03-19  Glenn Morris  <rgm@gnu.org>
+
+       * url.el: Move mailcap require earlier in the file.
+
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+       * url-vars.el (url): Put in comm group.
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Branch for 23.2.
+
 2010-01-23  Chong Yidong  <cyd@stupidchicken.com>
 
        * url-util.el: Require url-vars (Bug#5459).
@@ -47,8 +74,8 @@
 2009-09-12  Chong Yidong  <cyd@stupidchicken.com>
 
        * url-methods.el (url-scheme--registering-proxy): New variable.
-       (url-scheme-register-proxy, url-scheme-get-property): Avoid
-       calling url-scheme-register-proxy in an infloop (Bug#4191).
+       (url-scheme-register-proxy, url-scheme-get-property):
+       Avoid calling url-scheme-register-proxy in an infloop (Bug#4191).
 
 2009-08-22  Glenn Morris  <rgm@gnu.org>