Update copyright notices for 2013.

[bpt/emacs.git] / lisp / url / url-privacy.el

diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index ae1f707..0c09168 100644 (file)
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -1,16 +1,15 @@
 ;;; url-privacy.el --- Global history tracking for URL package
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2013 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,13 +17,10 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
 (require 'url-vars)
 
 (defun url-device-type (&optional device)
@@ -44,19 +40,16 @@
          nil)
         ;; First, we handle the inseparable OS/Windowing system
         ;; combinations
-        ((eq system-type 'Apple-Macintosh) "Macintosh")
-        ((eq system-type 'next-mach) "NeXT")
         ((eq system-type 'windows-nt) "Windows-NT; 32bit")
-        ((eq system-type 'ms-windows) "Windows; 16bit")
         ((eq system-type 'ms-dos) "MS-DOS; 32bit")
         ((memq (url-device-type) '(win32 w32)) "Windows; 32bit")
         ((eq (url-device-type) 'pm) "OS/2; 32bit")
         (t
-         (case (url-device-type)
-           (x "X11")
-           (ns "OpenStep")
-           (tty "TTY")
-           (otherwise nil)))))
+         (pcase (url-device-type)
+           (`x "X11")
+           (`ns "OpenStep")
+           (`tty "TTY")
+           (_ nil)))))
 
   (setq url-personal-mail-address (or url-personal-mail-address
                                      user-mail-address
@@ -80,5 +73,4 @@
 
 (provide 'url-privacy)
 
-;; arch-tag: fdaf95e4-98f0-4680-94c3-f3eadafabe1d
 ;;; url-privacy.el ends here