Merge changes from emacs-23 branch

[gnu-emacs] / lisp / url / url-vars.el

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 06d3c2dcccc493393ff3c240e6dddb4f186024b2..42d33553e14a113663e5349aacd03cb704aae4fd 100644 (file)
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,7 +1,6 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2001, 2004-2011  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -234,7 +233,7 @@ Generated according to current coding system priorities."
                (mapconcat 'symbol-name ordered ";q=0.5, ")
                ";q=0.5"))))
 
-(defvar url-mime-charset-string (url-mime-charset-string)
+(defvar url-mime-charset-string nil
   "*String to send in the Accept-charset: field in HTTP requests.
 The MIME charset corresponding to the most preferred coding system is
 given priority 1 and the rest are given priority 0.5.")
@@ -390,5 +389,4 @@ This should be set, e.g. by mail user agents rendering HTML to avoid
 
 (provide 'url-vars)
 
-;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49
 ;;; url-vars.el ends here