[Emacs-diffs] emacs/lisp/url ChangeLog url-file.el url-privac...

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/08/22 21:53:35

Modified files:
        lisp/url       : ChangeLog url-file.el url-privacy.el 

Log message:
        Remove code for defunct system-types Apple-Macintosh, emx, ms-windows,
        next-mach.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/ChangeLog?cvsroot=emacs&r1=1.180&r2=1.181
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-file.el?cvsroot=emacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-privacy.el?cvsroot=emacs&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/ChangeLog,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- ChangeLog   21 Jun 2009 14:35:31 -0000      1.180
+++ ChangeLog   22 Aug 2009 21:53:34 -0000      1.181
@@ -1,3 +1,9 @@
+2009-08-22  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Branch for 23.1.

Index: url-file.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-file.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- url-file.el 7 Feb 2009 21:22:55 -0000       1.25
+++ url-file.el 22 Aug 2009 21:53:34 -0000      1.26
@@ -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 @@
         (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)))

Index: url-privacy.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-privacy.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- url-privacy.el      5 Jan 2009 03:24:20 -0000       1.15
+++ url-privacy.el      22 Aug 2009 21:53:35 -0000      1.16
@@ -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")