Remove code for defunct system-types Apple-Macintosh, emx, ms-windows,

next-mach.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index a081ff7..e5ce883 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-22  Glenn Morris  <rgm@gnu.org>
+
+       * url-file.el (url-file-build-filename):
+       * url-privacy.el (url-setup-privacy-info): Remove code for defunct
+       system-types Apple-Macintosh, emx, ms-windows, next-mach.
+
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * Branch for 23.1.

diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index bb8f136..e58da0e 100644 (file)
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -1,7 +1,7 @@
 ;;; url-file.el --- File retrieval code
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;;   2009  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -105,8 +105,7 @@ to them."
         (file (url-unhex-string (url-filename url)))
         (filename (if (or user (not (url-file-host-is-local-p host)))
                       (concat "/" (or user "anonymous") "@" site ":" file)
-                    (if (and (memq system-type
-                                   '(emx ms-dos windows-nt ms-windows))
+                    (if (and (memq system-type '(ms-dos windows-nt))
                              (string-match "^/[a-zA-Z]:/" file))
                         (substring file 1)
                       file)))

diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index 11eb601..9198678 100644 (file)
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -1,7 +1,7 @@
 ;;; url-privacy.el --- Global history tracking for URL package
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;;   2009  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -42,10 +42,7 @@
          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")