Merge from emacs--rel--22

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

diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index 4c16d471e86f5c18c221f14beafd8e5b894d93c0..d8db9ea8a53082b0e5c87fc9af2cd0d8f030a466 100644 (file)
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -1,6 +1,7 @@
 ;;; url-about.el --- Show internal URLs
 
-;; Copyright (C) 2001, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -8,7 +9,7 @@
 ;;
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 ;;
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -25,8 +26,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
 (require 'url-util)
 (require 'url-parse)