Merge from emacs-23 branch

[gnu-emacs] / lisp / url / ChangeLog

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 799fddc886e8fb098343115870667a63916033ab..d3231672dd223d3d46f10f0b978556cb0544b973 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,39 @@
+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).
+
+2009-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * url-parse.el (url-generic-parse-url): Bind deactivate-mark.
+
+2009-11-08  Kai Tetzlaff  <kai.tetzlaff@web.de>  (tiny change)
+
+       * url-http.el (url-http-handle-authentication): Use proxy server,
+       if any, for authentication (Bug#4883).
+
 2009-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * url-util.el (url-insert-entities-in-string):
@@ -42,7 +78,7 @@
 2009-02-21  Jason Rumney  <jasonr@gnu.org>
 
        * url-expand.el (url-default-expander): Use concat to combine
-       parts. (Bug #1020)
+       parts.  (Bug #1020)
 
 2009-02-10  Glenn Morris  <rgm@gnu.org>
 
@@ -2180,7 +2216,7 @@
 ;; End:
 
     Copyright (C) 1999, 2001, 2002, 2004, 2005,
-       2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+       2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.