Update years in copyright notice; nfc.

diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index d2fae55b14155e962ed4ad83baa7b84286bac19c..c305bb31f7ae51bd2cf94006569814acd9927708 100644 (file)
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -1,6 +1,6 @@
 ;;; url-about.el --- Show internal URLs
 
-;; Copyright (c) 2001, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 336c28eab261106ef7867f04f71098b18787fcc6..317f91c9a13841d97047ccdf4d0d1d204abd6322 100644 (file)
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -1,6 +1,7 @@
 ;;; url-auth.el --- Uniform Resource Locator authorization modules
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index e80ba059393dfeef70edf6372c252a2751ef543b..40967446dd7ee35d7a459a2b92583ca80300ac69 100644 (file)
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -1,6 +1,7 @@
 ;;; url-cache.el --- Uniform Resource Locator retrieval tool
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -39,7 +40,7 @@
        (if (file-exists-p file)
            (not (file-directory-p file))
          (file-directory-p (file-name-directory file)))))
-                
+
 (defun url-cache-prepare (file)
   "Makes it possible to cache data in FILE.
 Creates any necessary parent directories, deleting any non-directory files
@@ -70,7 +71,7 @@ FILE can be created or overwritten."
        (if (url-cache-prepare fname)
            (let ((coding-system-for-write 'binary))
              (write-region (point-min) (point-max) fname nil 5)))))))
-       
+
 ;;;###autoload
 (defun url-is-cached (url)
   "Return non-nil if the URL is cached."

diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index 40307c49eaf82a277a9b77438444331aaf6bf5eb..abaf8dd9e7671f51e1d5425ecea1760990ce0f8e 100644 (file)
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,6 +1,6 @@
 ;;; url-cid.el --- Content-ID URL loader
 
-;; Copyright (c) 1998 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 314911f789b1cebeb46618dbb27555e10f201f53..618f89e60e90a7ea9a5a5b49cf0d339d00dfaa75 100644 (file)
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -1,6 +1,7 @@
 ;;; url-cookie.el --- Netscape Cookie support
 
-;; Copyright (c) 1996 - 1999,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 1b683124c94c5886ded90af0a43d563fb4673216..2a6b28b9b3c64fdefc95dc0e1959f61e62c1637b 100644 (file)
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -1,6 +1,6 @@
 ;;; url-dav.el --- WebDAV support
 
-;; Copyright (C) 2001, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>

diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 5d5381db0bfde5c2201816605d564b3fc49f7de7..7c635d13e3b5a8c5dcc8f61083beab0156ffa904 100644 (file)
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -1,6 +1,7 @@
 ;;; url-dired.el --- URL Dired minor mode
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, files
 

diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index c8e17a524bb62c5e5968b3433353340c886508bc..ca4b8c72ab8a8990555f92a1edeff4fe06966641 100644 (file)
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -1,6 +1,6 @@
 ;;; url-expand.el --- expand-file-name for URLs
 
-;; Copyright (c) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 7e224bd14208a6e2bf7246800da1473ce704d515..44a4f8bd9f48f24597c59b10a909e58c457d68e2 100644 (file)
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -1,6 +1,7 @@
 ;;; url-file.el --- File retrieval code
 
-;; Copyright (c) 1996 - 1999,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index 966000249d3e41a30bf87ffd9542468f3d63b0ce..633f4ed40d137034fd49bd9363222703b85118a7 100644 (file)
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -1,6 +1,7 @@
 ;;; url-ftp.el --- FTP wrapper
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index e0ccbbdc4e7bc7532c6c3974331fb2a09a9eaac2..66ac39612fd3713d7d07c79cdc096a498d84b23a 100644 (file)
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,6 +1,6 @@
 ;;; url-gw.el --- Gateway munging for URL loading
 
-;; Copyright (c) 1997, 1998, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes

diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index cc626a4cb448138a42589c976663e9080235a096..bbbf19f53fcb4e527d122acca40d1fd6d59285ea 100644 (file)
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -1,6 +1,7 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading
 
-;; Copyright (c) 1996, 1997, 1998, 1999, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 040f83ad2f2a41bd7d04a6f57bac881d616b63f8..6da5dd915514d6c2d6c7aefcfbbef9f8366d70be 100644 (file)
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -1,6 +1,7 @@
 ;;; url-history.el --- Global history tracking for URL package
 
-;; Copyright (c) 1996 - 1999,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index b8bf920e2e552ad464493373667ec8640f662794..2071b4e058ffb451bc0b6e26c58dda01974c3043 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,6 +1,6 @@
 ;;; url-http.el --- HTTP retrieval routines
 
-;; Copyright (c) 1999, 2001, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes

diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el
index e7aeffde78876a314fa058b43d77c0147303c8cc..1777da0b6b9fdf7dedc188aa6a233a002259ddc8 100644 (file)
--- a/lisp/url/url-https.el
+++ b/lisp/url/url-https.el
@@ -1,6 +1,6 @@
 ;;; url-https.el --- HTTP over SSL/TLS routines
 
-;; Copyright (c) 1999, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index 9d923e17259e4eb37aa08fb665f621b1042677ff..8d1b9b3877b1f3dd8c5708dce7fe10fa9c928aae 100644 (file)
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -1,6 +1,6 @@
 ;;; url-imap.el --- IMAP retrieval routines
 
-;; Copyright (c) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: comm, data, processes

diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index dd88a85a03ae767bd235a21f112093cfd0843626..a06bdff5bfd377c5c1102adc4a631512e715a3d9 100644 (file)
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,6 +1,7 @@
 ;;; url-irc.el --- IRC URL interface
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index 9b7ce5c89b46527b211cc9a2069a81ef18f069fe..ce7b7a9bab1f30e0f96d66477a28afa9c21f2f66 100644 (file)
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -1,5 +1,6 @@
 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
-;; Copyright (c) 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -189,7 +190,7 @@ URL can be a URL string, or a URL vector of the type returned by
 
        (setq binddn (cdr-safe (or (assoc "bindname" extensions)
                                   (assoc "!bindname" extensions))))
-    
+
        ;; Now, let's actually do something with it.
        (setq results (cdr (ldap-search-internal
                       (list 'host (concat host ":" (number-to-string port))

diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index fc3eb97e0855eb71913d120bdda27b862f4e079b..86f5d4a88b6c5fbbf3e796275aa16fd453b1ee59 100644 (file)
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -1,6 +1,7 @@
 ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index a82d78db3ac3ba43fc6aca51d014ec2c7c114779..e39ffa1eb5b46c0d6cdaae0ca0be22341afc32f1 100644 (file)
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -1,6 +1,7 @@
 ;;; url-methods.el --- Load URL schemes as needed
 
-;; Copyright (c) 1996,1997,1998,1999,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index e937c99a518080a260dfe12a7543dcf6075e834e..5041a40742056cc9e324cd54fa363702ca9e02fc 100644 (file)
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,6 +1,7 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
 
-;; Copyright (c) 1996,1997,1998,1999,2002 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 969edf6f6849227a00462c68ff76e00026afbf9f..593f33bb3f7b2ca42e59f27b1693a79e50130884 100644 (file)
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -1,6 +1,7 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
 
-;; Copyright (c) 1996 - 1999, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index 0273415b8abdca3938c49e5ea1e4634f2b30b6d4..858cd029a8563a3eae50bae01bc13aa0f9d53b8c 100644 (file)
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -1,6 +1,7 @@
 ;;; url-nfs.el --- NFS URL interface
 
-;; Copyright (c) 1996,1997,1998,1999,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 

diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index d76c7cf459d2137950b13be0813926ceeedf34f7..3edbf2c84d4c9fb76cd40f1658f3a289c78a19b9 100644 (file)
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -1,6 +1,6 @@
 ;;; url-ns.el --- Various netscape-ish functions for proxy definitions
 
-;; Copyright (c) 1997 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index db85c43a38fe9d2dabde20f716ca39467bb3ebe8..bbe7f112cea0d497f05587d3af3afbce32b788a1 100644 (file)
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -1,6 +1,7 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
 
-;; Copyright (c) 1996,1997,1998,1999,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -84,7 +85,7 @@
 
 (defmacro url-set-full (urlobj val)
   `(aset ,urlobj 8 ,val))
-  
+
 ;;;###autoload
 (defun url-recreate-url (urlobj)
   "Recreate a URL string from the parsed URLOBJ."

diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index e28a388dfa3545b1cf144521e52540ede6055112..7700bb1394190ab727c8a0f34517ca86a633b70d 100644 (file)
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -1,6 +1,7 @@
 ;;; url-privacy.el --- Global history tracking for URL package
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index 1eb8f90bda37f7265ed9ad0438dd1af525fe2a16..c5d7753daf501edc9b42e282f2f53043076e5901 100644 (file)
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -1,6 +1,6 @@
 ;;; url-proxy.el --- Proxy server support
 
-;; Copyright (c) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index e64d328fd3d40a63d12f91d4a9267e2abe949ff3..bec0c7a313312b4c7af6fc58e9cf9d47960edf63 100644 (file)
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -1,6 +1,7 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library
 
-;; Copyright (c) 1996,1997,1998,1999,2001,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 7666989917297549c70d80b735c4bbdf78b5be40..53b8a5eef31551f65bb5cf7655fef6095e16efb3 100644 (file)
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,6 +1,7 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
 
-;; Copyright (c) 1996,1997,1998,1999,2001,2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 

diff --git a/lisp/url/url.el b/lisp/url/url.el
index 21859ad95669352b35aafc1f9ba00dacfa50d1a8..ef101fe6f2a13c3a256b2678b744943372ad4c5f 100644 (file)
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -1,7 +1,7 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool
 
-;; Copyright (c) 1996, 1997, 1998, 1999, 2001, 2004, 2005
-;;           Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes, hypermedia
@@ -56,7 +56,7 @@
 (require 'url-parse)
 (require 'url-util)
 
-;; Fixme: customize? convert-standard-filename? 
+;; Fixme: customize? convert-standard-filename?
 ;;;###autoload
 (defvar url-configuration-directory "~/.url")
 
@@ -71,7 +71,7 @@ Emacs."
 
     (mailcap-parse-mailcaps)
     (mailcap-parse-mimetypes)
-    
+
     ;; Register all the authentication schemes we can handle
     (url-register-auth-scheme "basic" nil 4)
     (url-register-auth-scheme "digest" nil 7)
@@ -79,11 +79,11 @@ Emacs."
     (setq url-cookie-file
          (or url-cookie-file
              (expand-file-name "cookies" url-configuration-directory)))
-    
+
     (setq url-history-file
          (or url-history-file
              (expand-file-name "history" url-configuration-directory)))
-  
+
     ;; Parse the global history file if it exists, so that it can be used
     ;; for URL completion, etc.
     (url-history-parse-history)
@@ -229,7 +229,7 @@ no further processing).  URL is either a string or a parsed URL."
            (message "Viewing externally")
            (kill-buffer (current-buffer)))
        (display-buffer (current-buffer))
-       (add-hook 'kill-buffer-hook 
+       (add-hook 'kill-buffer-hook
                  `(lambda () (mm-destroy-parts ',handle))
                  nil
                  t)))))

diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el
index bfc532958b69d9dd48e77d5e36e4fcc6f0675bbe..926b90d5f31c53c6514504ab785aecb990a098f8 100644 (file)
--- a/lisp/url/vc-dav.el
+++ b/lisp/url/vc-dav.el
@@ -1,6 +1,6 @@
 ;;; vc-dav.el --- vc.el support for WebDAV
 
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
@@ -57,7 +57,7 @@ For a list of possible values, see `vc-state'."
          ;; _WE_ have a lock
          'edited
        (cdr (car locks)))))))
-       
+
 (defun vc-dav-checkout-model (url)
   "Indicate whether URL needs to be \"checked out\" before it can be edited.
 See `vc-checkout-model' for a list of possible values."