aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url
diff options
context:
space:
mode:
authorKaroly Lorentey2006-02-06 18:44:57 +0000
committerKaroly Lorentey2006-02-06 18:44:57 +0000
commita5805c9d0240fab504f2a3e32db6449392005fb6 (patch)
treea6eba3e018d5edf0f33476dcf5d2f2ac50983307 /lisp/url
parentfbb63435176d3614d3603b675784122bf50d22b1 (diff)
parent55495ab90ed2afd64f757e55f697d716a7c7b75c (diff)
downloademacs-a5805c9d0240fab504f2a3e32db6449392005fb6.tar.gz
emacs-a5805c9d0240fab504f2a3e32db6449392005fb6.zip
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-41 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-42 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-43 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-44 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-45 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-46 Merge from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-47 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-48 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-14 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-15 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-16 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-17 Merge from emacs--devo--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/url-about.el2
-rw-r--r--lisp/url/url-auth.el2
-rw-r--r--lisp/url/url-cid.el2
-rw-r--r--lisp/url/url-dav.el2
-rw-r--r--lisp/url/url-dired.el2
-rw-r--r--lisp/url/url-expand.el2
-rw-r--r--lisp/url/url-file.el2
-rw-r--r--lisp/url/url-ftp.el2
-rw-r--r--lisp/url/url-gw.el2
-rw-r--r--lisp/url/url-http.el2
-rw-r--r--lisp/url/url-https.el2
-rw-r--r--lisp/url/url-imap.el2
-rw-r--r--lisp/url/url-irc.el2
-rw-r--r--lisp/url/url-ldap.el2
-rw-r--r--lisp/url/url-mailto.el2
-rw-r--r--lisp/url/url-methods.el2
-rw-r--r--lisp/url/url-misc.el2
-rw-r--r--lisp/url/url-nfs.el2
-rw-r--r--lisp/url/url-ns.el3
-rw-r--r--lisp/url/url-parse.el2
-rw-r--r--lisp/url/url-proxy.el2
-rw-r--r--lisp/url/url-util.el2
-rw-r--r--lisp/url/vc-dav.el2
23 files changed, 24 insertions, 23 deletions
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index c305bb31f7a..d0dcc6dc905 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -1,6 +1,6 @@
1;;; url-about.el --- Show internal URLs 1;;; url-about.el --- Show internal URLs
2 2
3;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Keywords: comm, data, processes, hypermedia 5;; Keywords: comm, data, processes, hypermedia
6 6
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 317f91c9a13..5845b9d660e 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -1,7 +1,7 @@
1;;; url-auth.el --- Uniform Resource Locator authorization modules 1;;; url-auth.el --- Uniform Resource Locator authorization modules
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes, hypermedia 6;; Keywords: comm, data, processes, hypermedia
7 7
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index abaf8dd9e76..f6e569a4b2f 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,6 +1,6 @@
1;;; url-cid.el --- Content-ID URL loader 1;;; url-cid.el --- Content-ID URL loader
2 2
3;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1998, 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Keywords: comm, data, processes 5;; Keywords: comm, data, processes
6 6
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 2a6b28b9b3c..449d8a510b5 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -1,6 +1,6 @@
1;;; url-dav.el --- WebDAV support 1;;; url-dav.el --- WebDAV support
2 2
3;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Author: Bill Perry <wmperry@gnu.org> 5;; Author: Bill Perry <wmperry@gnu.org>
6;; Maintainer: Bill Perry <wmperry@gnu.org> 6;; Maintainer: Bill Perry <wmperry@gnu.org>
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index b5ff892721e..28f86560942 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -1,7 +1,7 @@
1;;; url-dired.el --- URL Dired minor mode 1;;; url-dired.el --- URL Dired minor mode
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, files 6;; Keywords: comm, files
7 7
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index ca4b8c72ab8..4f422e5cc5f 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -1,6 +1,6 @@
1;;; url-expand.el --- expand-file-name for URLs 1;;; url-expand.el --- expand-file-name for URLs
2 2
3;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Keywords: comm, data, processes 5;; Keywords: comm, data, processes
6 6
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 64766930c43..c9bbebdfddb 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -1,7 +1,7 @@
1;;; url-file.el --- File retrieval code 1;;; url-file.el --- File retrieval code
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
7 7
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index 633f4ed40d1..8ff43ff57a5 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -1,7 +1,7 @@
1;;; url-ftp.el --- FTP wrapper 1;;; url-ftp.el --- FTP wrapper
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
7 7
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 66ac39612fd..0cd2e6f9a50 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,6 +1,6 @@
1;;; url-gw.el --- Gateway munging for URL loading 1;;; url-gw.el --- Gateway munging for URL loading
2 2
3;; Copyright (C) 1997, 1998, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 1998, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Author: Bill Perry <wmperry@gnu.org> 5;; Author: Bill Perry <wmperry@gnu.org>
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 725f4bc1c8a..ac8f490f3e8 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,6 +1,6 @@
1;;; url-http.el --- HTTP retrieval routines 1;;; url-http.el --- HTTP retrieval routines
2 2
3;; Copyright (C) 1999, 2001, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1999, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Author: Bill Perry <wmperry@gnu.org> 5;; Author: Bill Perry <wmperry@gnu.org>
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el
index 1777da0b6b9..a7440a76535 100644
--- a/lisp/url/url-https.el
+++ b/lisp/url/url-https.el
@@ -1,6 +1,6 @@
1;;; url-https.el --- HTTP over SSL/TLS routines 1;;; url-https.el --- HTTP over SSL/TLS routines
2 2
3;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Keywords: comm, data, processes 5;; Keywords: comm, data, processes
6 6
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index 8d1b9b3877b..a10db8e7445 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -1,6 +1,6 @@
1;;; url-imap.el --- IMAP retrieval routines 1;;; url-imap.el --- IMAP retrieval routines
2 2
3;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Author: Simon Josefsson <jas@pdc.kth.se> 5;; Author: Simon Josefsson <jas@pdc.kth.se>
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index a06bdff5bfd..a876657d393 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,7 +1,7 @@
1;;; url-irc.el --- IRC URL interface 1;;; url-irc.el --- IRC URL interface
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
7 7
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index ce7b7a9bab1..64471bae5b1 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -1,6 +1,6 @@
1;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code 1;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
2 2
3;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1998, 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Keywords: comm, data, processes 5;; Keywords: comm, data, processes
6 6
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index e9d5ff6fc15..d9d6e22cd05 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -1,7 +1,7 @@
1;;; url-mail.el --- Mail Uniform Resource Locator retrieval code 1;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
7 7
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index e39ffa1eb5b..6854d62af03 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -1,7 +1,7 @@
1;;; url-methods.el --- Load URL schemes as needed 1;;; url-methods.el --- Load URL schemes as needed
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes, hypermedia 6;; Keywords: comm, data, processes, hypermedia
7 7
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index 5041a407420..f7f9bcd439c 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,7 +1,7 @@
1;;; url-misc.el --- Misc Uniform Resource Locator retrieval code 1;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
7 7
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index e6822efc242..d6bc8417631 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -1,7 +1,7 @@
1;;; url-nfs.el --- NFS URL interface 1;;; url-nfs.el --- NFS URL interface
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
7 7
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index 3edbf2c84d4..6b017b83ca9 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -1,6 +1,7 @@
1;;; url-ns.el --- Various netscape-ish functions for proxy definitions 1;;; url-ns.el --- Various netscape-ish functions for proxy definitions
2 2
3;; Copyright (C) 1997, 1998, 1999, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 1998, 1999, 2004, 2005,
4;; 2006 Free Software Foundation, Inc.
4 5
5;; Keywords: comm, data, processes, hypermedia 6;; Keywords: comm, data, processes, hypermedia
6 7
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index bbe7f112cea..f84bf1a7ba2 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -1,7 +1,7 @@
1;;; url-parse.el --- Uniform Resource Locator parser 1;;; url-parse.el --- Uniform Resource Locator parser
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Keywords: comm, data, processes 6;; Keywords: comm, data, processes
7 7
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index c5d7753daf5..c3bfb1e0c4b 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -1,6 +1,6 @@
1;;; url-proxy.el --- Proxy server support 1;;; url-proxy.el --- Proxy server support
2 2
3;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Keywords: comm, data, processes, hypermedia 5;; Keywords: comm, data, processes, hypermedia
6 6
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 538eb3eca45..f33a58950fc 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -1,7 +1,7 @@
1;;; url-util.el --- Miscellaneous helper routines for URL library 1;;; url-util.el --- Miscellaneous helper routines for URL library
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
4;; 2005 Free Software Foundation, Inc. 4;; 2005, 2006 Free Software Foundation, Inc.
5 5
6;; Author: Bill Perry <wmperry@gnu.org> 6;; Author: Bill Perry <wmperry@gnu.org>
7;; Keywords: comm, data, processes 7;; Keywords: comm, data, processes
diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el
index 926b90d5f31..8181788a05c 100644
--- a/lisp/url/vc-dav.el
+++ b/lisp/url/vc-dav.el
@@ -1,6 +1,6 @@
1;;; vc-dav.el --- vc.el support for WebDAV 1;;; vc-dav.el --- vc.el support for WebDAV
2 2
3;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. 3;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Author: Bill Perry <wmperry@gnu.org> 5;; Author: Bill Perry <wmperry@gnu.org>
6;; Maintainer: Bill Perry <wmperry@gnu.org> 6;; Maintainer: Bill Perry <wmperry@gnu.org>