Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org

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

diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 71c03bf1edd76f4be37615bacb634bd25710ebc7..b91c85c0c3d844cdc077cfff0523668833ea1be1 100644 (file)
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -1,6 +1,6 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
 
-;; Copyright (C) 1996-1999, 2004-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2012 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -35,7 +35,8 @@
                           (&optional type user password host portspec filename
                                      target attributes fullness))
             (:copier nil))
-  type user password host portspec filename target attributes fullness silent)
+  type user password host portspec filename target attributes fullness
+  silent (use-cookies t))
 
 (defsubst url-port (urlobj)
   (or (url-portspec urlobj)