Remove code for defunct system-types emx, macos, mswindows,

unisoft-unix, vax-vms, win32, w32.

10 files changed, 26 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 469d5227010..0614405eb3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,17 @@
 2009-08-22  Glenn Morris  <rgm@gnu.org>
 
+        * hippie-exp.el (he-concat-directory-file-name):
+        * lpr.el (lpr-windows-system, printer-name):
+        * ls-lisp.el (ls-lisp-emulation, ls-lisp-use-insert-directory-program):
+        * ps-print.el (ps-windows-system):
+        * startup.el (command-line):
+        * emulation/viper-ex.el (viper-glob-function):
+        * international/mule-cmds.el (set-language-environment-coding-systems):
+        * net/ange-ftp.el (ange-ftp-write-region):
+        * obsolete/fast-lock.el (fast-lock-cache-name):
+        Remove code for defunct system-types emx, macos, mswindows,
+        unisoft-unix, vax-vms, win32, w32.
+
         * calendar/diary-lib.el (diary-mark-entries-1): Only mark all days of a
         given name if the pattern is not more specific.
 
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 3f8c48474d5..fcc98db3204 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -329,7 +329,6 @@ Don't put `-c' here, as it is added automatically."
 
 (defcustom viper-glob-function
   (cond (ex-unix-type-shell 'viper-glob-unix-files)
-        ((eq system-type 'emx) 'viper-glob-mswindows-files) ; OS/2
         (viper-ms-style-os-p 'viper-glob-mswindows-files) ; Microsoft OS
         (t  'viper-glob-unix-files) ; presumably UNIX
         )
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 8cf18b17c06..752a61613bb 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -1,7 +1,7 @@
 ;;; hippie-exp.el --- expand text trying various ways to find its expansion
 
-;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009  Free Software Foundation, Inc.
 
 ;; Author: Anders Holst <aho@sans.kth.se>
 ;; Last change: 3 March 1998
@@ -519,7 +519,7 @@ otherwise."
 (defun he-concat-directory-file-name (dir-part name-part)
   "Try to slam together two parts of a file specification, system dependently."
   (cond ((null dir-part) name-part)
-        ((memq system-type '(ms-dos w32))
+        ((eq system-type 'ms-dos)
          (if (and (string-match "\\\\" dir-part)
                   (not (string-match "/" dir-part))
                   (= (aref name-part (1- (length name-part))) ?/))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5ec3f286b9d..6579297ba0c 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1968,7 +1968,6 @@ See `set-language-info-alist' for use in programs."
          (eol-type
           (if (null default-buffer-file-coding-system)
               (cond ((memq system-type '(windows-nt ms-dos)) 1)
-                    ((eq system-type 'macos) 2)
                     (t 0))
             (coding-system-eol-type default-buffer-file-coding-system))))
     (when priority
diff --git a/lisp/lpr.el b/lisp/lpr.el
index b8614af18ff..c12e01c1667 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -31,7 +31,7 @@
 
 ;;;###autoload
 (defvar lpr-windows-system
-  (memq system-type '(emx win32 w32 mswindows ms-dos windows-nt)))
+  (memq system-type '(ms-dos windows-nt)))
 
 ;;;###autoload
 (defvar lpr-lp-system
@@ -45,7 +45,7 @@
 
 ;;;###autoload
 (defcustom printer-name
-  (and (memq system-type '(emx ms-dos)) "PRN")
+  (and (eq system-type 'ms-dos) "PRN")
   "The name of a local printer to which data is sent for printing.
 \(Note that PostScript files are sent to `ps-printer-name', which see.\)
 
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 060e4011a4a..ee5db5bf1f5 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -70,10 +70,9 @@
   :group 'dired)
 
 (defcustom ls-lisp-emulation
-  (cond ((eq system-type 'macos) 'MacOS)
-        ;; ((eq system-type 'windows-nt) 'MS-Windows)
+  (cond ;; ((eq system-type 'windows-nt) 'MS-Windows)
         ((memq system-type
-               '(hpux usg-unix-v unisoft-unix irix berkeley-unix))
+               '(hpux usg-unix-v irix berkeley-unix))
          'UNIX))                        ; very similar to GNU
   ;; Anything else defaults to nil, meaning GNU.
   "Platform to emulate: GNU (default), MacOS, MS-Windows, UNIX.
@@ -129,7 +128,7 @@ if emulation is GNU then default is `(links uid gid)'."
   :group 'ls-lisp)
 
 (defcustom ls-lisp-use-insert-directory-program
-  (not (memq system-type '(macos ms-dos windows-nt)))
+  (not (memq system-type '(ms-dos windows-nt)))
   "Non-nil causes ls-lisp to revert back to using `insert-directory-program'.
 This is useful on platforms where ls-lisp is dumped into Emacs, such as
 Microsoft Windows, but you would still like to use a program to list
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 2c20e8c94d8..8499a896db6 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,7 +1,8 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
 ;; Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
 ;; Maintainer: FSF
@@ -3220,7 +3221,7 @@ system TYPE.")
                ;; regardless. Maybe a system-type to host-type lookup?
                (binary (or (ange-ftp-binary-file filename)
                            (and (not (memq system-type
-                                           '(ms-dos windows-nt macos vax-vms)))
+                                           '(ms-dos windows-nt)))
                                 (memq (ange-ftp-host-type host user)
                                       '(unix dumb-unix)))))
                (cmd (if append 'append 'put))
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 66ccbed50b8..7027ab02d82 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -549,7 +549,7 @@ See `fast-lock-cache-directory'."
       (concat buffer-file-name ".flc")
     (let* ((bufile (expand-file-name buffer-file-truename))
            (chars-alist
-            (if (memq system-type '(emx windows-nt cygwin))
+            (if (memq system-type '(windows-nt cygwin))
                 '((?/ . (?#)) (?# . (?# ?#)) (?: . (?\;)) (?\; . (?\; ?\;)))
               '((?/ . (?#)) (?# . (?# ?#)))))
            (mapchars
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 16be4439a59..cbf3785e3d1 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1478,7 +1478,7 @@ Please send all bug fixes and enhancements to
 
 
 (defconst ps-windows-system
-  (memq system-type '(emx win32 w32 mswindows ms-dos windows-nt)))
+  (memq system-type '(ms-dos windows-nt)))
 (defconst ps-lp-system
   (memq system-type '(usg-unix-v hpux irix)))
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 3d177f9d944..cc2165bcfb4 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -741,13 +741,9 @@ opening the first frame (e.g. open a connection to an X server).")
   ;; Set the default strings to display in mode line for
   ;; end-of-line formats that aren't native to this platform.
   (cond
-   ((memq system-type '(ms-dos windows-nt emx))
+   ((memq system-type '(ms-dos windows-nt))
     (setq eol-mnemonic-unix "(Unix)"
           eol-mnemonic-mac  "(Mac)"))
-   ;; Both Mac and Unix EOLs are now "native" on Mac OS so keep the
-   ;; abbreviated strings `/' and `:' set in coding.c for them.
-   ((eq system-type 'macos)
-    (setq eol-mnemonic-dos  "(DOS)"))
    (t                                   ; this is for Unix/GNU/Linux systems
     (setq eol-mnemonic-dos  "(DOS)"
           eol-mnemonic-mac  "(Mac)")))