From 71ddfde5a548ac9a56b3652c4c8c1dd4f3fce1ce Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 15:55:38 +0000 Subject: [PATCH] Update years in copyright notice; nfc. --- lisp/url/url-about.el | 2 +- lisp/url/url-auth.el | 3 ++- lisp/url/url-cache.el | 7 ++++--- lisp/url/url-cid.el | 2 +- lisp/url/url-cookie.el | 3 ++- lisp/url/url-dav.el | 2 +- lisp/url/url-dired.el | 3 ++- lisp/url/url-expand.el | 2 +- lisp/url/url-file.el | 3 ++- lisp/url/url-ftp.el | 3 ++- lisp/url/url-gw.el | 2 +- lisp/url/url-handlers.el | 3 ++- lisp/url/url-history.el | 3 ++- lisp/url/url-http.el | 2 +- lisp/url/url-https.el | 2 +- lisp/url/url-imap.el | 2 +- lisp/url/url-irc.el | 3 ++- lisp/url/url-ldap.el | 5 +++-- lisp/url/url-mailto.el | 3 ++- lisp/url/url-methods.el | 3 ++- lisp/url/url-misc.el | 3 ++- lisp/url/url-news.el | 3 ++- lisp/url/url-nfs.el | 3 ++- lisp/url/url-ns.el | 2 +- lisp/url/url-parse.el | 5 +++-- lisp/url/url-privacy.el | 3 ++- lisp/url/url-proxy.el | 2 +- lisp/url/url-util.el | 3 ++- lisp/url/url-vars.el | 3 ++- lisp/url/url.el | 14 +++++++------- lisp/url/vc-dav.el | 4 ++-- 31 files changed, 61 insertions(+), 42 deletions(-) diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el index d2fae55b141..c305bb31f7a 100644 --- 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 336c28eab26..317f91c9a13 100644 --- 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 e80ba059393..40967446dd7 100644 --- 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 40307c49eaf..abaf8dd9e76 100644 --- 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 314911f789b..618f89e60e9 100644 --- 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 1b683124c94..2a6b28b9b3c 100644 --- 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 ;; Maintainer: Bill Perry diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el index 5d5381db0bf..7c635d13e3b 100644 --- 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 c8e17a524bb..ca4b8c72ab8 100644 --- 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 7e224bd1420..44a4f8bd9f4 100644 --- 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 966000249d3..633f4ed40d1 100644 --- 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 e0ccbbdc4e7..66ac39612fd 100644 --- 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 ;; Keywords: comm, data, processes diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index cc626a4cb44..bbbf19f53fc 100644 --- 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 040f83ad2f2..6da5dd91551 100644 --- 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 b8bf920e2e5..2071b4e058f 100644 --- 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 ;; Keywords: comm, data, processes diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el index e7aeffde788..1777da0b6b9 100644 --- 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 9d923e17259..8d1b9b3877b 100644 --- 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 ;; Keywords: comm, data, processes diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el index dd88a85a03a..a06bdff5bfd 100644 --- 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 9b7ce5c89b4..ce7b7a9bab1 100644 --- 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 fc3eb97e085..86f5d4a88b6 100644 --- 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 a82d78db3ac..e39ffa1eb5b 100644 --- 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 e937c99a518..5041a407420 100644 --- 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 969edf6f684..593f33bb3f7 100644 --- 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 0273415b8ab..858cd029a85 100644 --- 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 d76c7cf459d..3edbf2c84d4 100644 --- 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 db85c43a38f..bbe7f112cea 100644 --- 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 e28a388dfa3..7700bb13941 100644 --- 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 1eb8f90bda3..c5d7753daf5 100644 --- 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 e64d328fd3d..bec0c7a3133 100644 --- 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 ;; Keywords: comm, data, processes diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 76669899172..53b8a5eef31 100644 --- 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 21859ad9566..ef101fe6f2a 100644 --- 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 ;; 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 bfc532958b6..926b90d5f31 100644 --- 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 ;; Maintainer: Bill Perry @@ -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."