Merge from mainline.

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

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 027256842356a98ace9b35a9b1409baf7dfa4461..1b9fd7b76cc2d0d302ed8edfc2ee2612cb2c8732 100644 (file)
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,7 +1,7 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -30,7 +30,7 @@
 (defgroup url nil
   "Uniform Resource Locator tool."
   :version "22.1"
-  :group 'hypermedia)
+  :group 'comm)
 
 (defgroup url-file nil
   "URL storage."
@@ -293,6 +293,8 @@ Applies when a protected document is denied by the server."
   "*Where temporary files go."
   :type 'directory
   :group 'url-file)
+(make-obsolete-variable 'url-temporary-directory
+                       'temporary-file-directory "23.1")
 
 (defcustom url-show-status t
   "*Whether to show a running total of bytes transferred.