Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-331
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-332
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-333
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-334
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-335
   Add note about "link" button-class to etc/TODO

 * emacs@sv.gnu.org/emacs--devo--0--patch-336
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-337
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-338
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-339
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-340
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-341
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-342
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-343
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-344
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-345
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-346
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-347
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-348
   Update for ERC 5.1.3.

 * emacs@sv.gnu.org/emacs--devo--0--patch-349
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-350
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-111
   Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-112
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-113
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-114
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-572

3 files changed, 30 insertions, 12 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8eb2cd8471b..901fac01208 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,8 +1,23 @@
+2006-07-12  Michael Olson  <mwolson@gnu.org>
+
+        * url-irc.el (url-irc-erc): Call erc-handle-irc-url.
+
+2006-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-cookie.el: Remove spurious * in docstrings.
+        (url-cookie-write-file): Don't use versioned backups.
+        (url-cookie-host-can-set-p): Remove unused var `tmp'.
+
+2006-07-04  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * url-cookie.el (url-cookie-save-interval): Move to url-cookie group.
+        (url-cookie-write-file): Reset url-cookies-changed-since-last-save.
+
 2006-05-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * url-http.el (url-http-file-exists-p): Test if status is integer.
 
-2006-05-05  Andreas Seltenreich  <seltenreich@gmx.de>  (tiny change)
+2006-05-05  Andreas Seltenreich  <seltenreich@gmx.de>
 
         * url-http.el (url-http-parse-headers): Don't reuse connection if
         "Connection: close" header was seen.
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 53ba75f4cbb..e74d4989117 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -88,18 +88,18 @@ A cookie vector object is a vector of 7 slots:
 (defvar url-cookie-storage nil         "Where cookies are stored.")
 (defvar url-cookie-secure-storage nil  "Where secure cookies are stored.")
 (defcustom url-cookie-file nil
-  "*File where cookies are stored on disk."
+  "File where cookies are stored on disk."
   :type '(choice (const :tag "Default" :value nil) file)
   :group 'url-file
   :group 'url-cookie)
 
 (defcustom url-cookie-confirmation nil
-  "*If non-nil, confirmation by the user is required to accept HTTP cookies."
+  "If non-nil, confirmation by the user is required to accept HTTP cookies."
   :type 'boolean
   :group 'url-cookie)
 
 (defcustom url-cookie-multiple-line nil
-  "*If nil, HTTP requests put all cookies for the server on one line.
+  "If nil, HTTP requests put all cookies for the server on one line.
 Some web servers, such as http://www.hotmail.com/, only accept cookies
 when they are on one line.  This is broken behavior, but just try
 telling Microsoft that."
@@ -168,7 +168,13 @@ telling Microsoft that."
       (insert ")\n(setq url-cookie-secure-storage\n '")
       (pp url-cookie-secure-storage (current-buffer))
       (insert ")\n")
+      (insert ";; Local Variables:\n"
+              ";; version-control: never\n"
+              ";; no-byte-compile: t\n"
+              ";; End:\n")
+      (set (make-local-variable 'version-control) t)
       (write-file fname)
+      (setq url-cookies-changed-since-last-save nil)
       (kill-buffer (current-buffer))))))
 
 (defun url-cookie-store (name value &optional expires domain localpart secure)
@@ -313,18 +319,17 @@ telling Microsoft that."
 '.'s in the domain name in order to set a cookie.")
 
 (defcustom url-cookie-trusted-urls nil
-  "*A list of regular expressions matching URLs to always accept cookies from."
+  "A list of regular expressions matching URLs to always accept cookies from."
   :type '(repeat regexp)
   :group 'url-cookie)
 
 (defcustom url-cookie-untrusted-urls nil
-  "*A list of regular expressions matching URLs to never accept cookies from."
+  "A list of regular expressions matching URLs to never accept cookies from."
   :type '(repeat regexp)
   :group 'url-cookie)
 
 (defun url-cookie-host-can-set-p (host domain)
   (let ((numdots 0)
-        (tmp domain)
         (last nil)
         (case-fold-search t)
         (mindots 3))
@@ -444,7 +449,7 @@ telling Microsoft that."
 (defvar url-cookie-timer nil)
 
 (defcustom url-cookie-save-interval 3600
-  "*The number of seconds between automatic saves of cookies.
+  "The number of seconds between automatic saves of cookies.
 Default is 1 hour.  Note that if you change this variable outside of
 the `customize' interface after `url-do-setup' has been run, you need
 to run the `url-cookie-setup-save-timer' function manually."
@@ -453,7 +458,7 @@ to run the `url-cookie-setup-save-timer' function manually."
            (if (bound-and-true-p url-setup-done)
                (url-cookie-setup-save-timer)))
   :type 'integer
-  :group 'url)
+  :group 'url-cookie)
 
 (defun url-cookie-setup-save-timer ()
   "Reset the cookie saver timer."
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index 6a7a62573e9..19eec6f2ef2 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -68,9 +68,7 @@ PASSWORD - What password to use"
       (switch-to-buffer (concat chan "@" host)))))
 
 (defun url-irc-erc (host port channel user password)
-  (erc-select :server host :port port :nick user :password password)
-  (when channel
-    (erc-join-channel channel)))
+  (erc-handle-irc-url host port channel user password))
 
 ;;;###autoload
 (defun url-irc (url)