Remove references to outdated systems.

References to win32 w32 mswindows ms-windows emx were probably
cargo-culted, and are removed for clarity.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 49eb225..e1f4b91 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -62,7 +62,7 @@
   (setq filename (byte-compiler-base-file-name filename))
   (setq filename (file-name-sans-versions filename))
   (setq filename (file-name-nondirectory filename))
-  (if (memq system-type '(win32 w32 mswindows windows-nt))
+  (if (eq system-type 'windows-nt)
       (setq filename (downcase filename)))
   (cond ((eq system-type 'vax-vms)
         (concat (substring filename 0 (string-match ";" filename)) "c"))

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 59fef84..b533818 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -916,8 +916,6 @@ XEmacs compatibility workaround."
                  (list
                   (cons 'x
                         (expand-file-name pixmap gnus-xmas-glyph-directory))
-                  (cons 'mswindows
-                        (expand-file-name pixmap gnus-xmas-glyph-directory))
                   (cons 'tty substring)))))
      (setq gnus-group-icon-cache
           (cons (cons pixmap glyph) gnus-group-icon-cache))

diff --git a/lisp/imap.el b/lisp/imap.el
index f9c89cd..785b02a 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -267,7 +267,7 @@ See also `imap-log'."
   :type 'string)
 
 (defcustom imap-read-timeout (if (string-match
-                                 "windows-nt\\|os/2\\|emx\\|cygwin"
+                                 "windows-nt\\|os/2\\|cygwin"
                                  (symbol-name system-type))
                                 1.0
                               0.1)

diff --git a/lisp/mailcap.el b/lisp/mailcap.el
index e725dfc..6461a9a 100644 (file)
--- a/lisp/mailcap.el
+++ b/lisp/mailcap.el
@@ -335,7 +335,7 @@ nil means your home directory."
   :group 'mailcap)
 
 (defvar mailcap-poor-system-types
-  '(ms-dos ms-windows windows-nt win32 w32 mswindows)
+  '(ms-dos windows-nt)
   "Systems that don't have a Unix-like directory hierarchy.")
 
 ;;;

diff --git a/lisp/message.el b/lisp/message.el
index e27694d..b281367 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5406,7 +5406,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
           (* 25 25)))
   (let ((tm (current-time)))
     (concat
-     (if (or (memq system-type '(ms-dos emx))
+     (if (or (eq system-type 'ms-dos)
             ;; message-number-base36 doesn't handle bigints.
             (floatp (user-uid)))
         (let ((user (downcase (user-login-name))))
@@ -6424,9 +6424,7 @@ are not included."
       (setq buffer-file-name (expand-file-name
                              (concat
                              (if (memq system-type
-                                       '(ms-dos ms-windows windows-nt
-                                                cygwin cygwin32 win32 w32
-                                                mswindows))
+                                       '(ms-dos windows-nt cygwin))
                                  "message"
                                "*message*")
                               (format-time-string "-%Y%m%d-%H%M%S"))

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index f657000..2be5667 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -680,7 +680,7 @@ superset of iso-8859-1."
   "100% binary coding system.")
 
 (defvar mm-text-coding-system
-  (or (if (memq system-type '(windows-nt ms-dos ms-windows))
+  (or (if (memq system-type '(windows-nt ms-dos))
          (and (mm-coding-system-p 'raw-text-dos) 'raw-text-dos)
        (and (mm-coding-system-p 'raw-text) 'raw-text))
       mm-binary-coding-system)
@@ -692,12 +692,12 @@ superset of iso-8859-1."
 (defvar mm-auto-save-coding-system
   (cond
    ((mm-coding-system-p 'utf-8-emacs)  ; Mule 7
-    (if (memq system-type '(windows-nt ms-dos ms-windows))
+    (if (memq system-type '(windows-nt ms-dos))
        (if (mm-coding-system-p 'utf-8-emacs-dos)
            'utf-8-emacs-dos mm-binary-coding-system)
       'utf-8-emacs))
    ((mm-coding-system-p 'emacs-mule)
-    (if (memq system-type '(windows-nt ms-dos ms-windows))
+    (if (memq system-type '(windows-nt ms-dos))
        (if (mm-coding-system-p 'emacs-mule-dos)
            'emacs-mule-dos mm-binary-coding-system)
       'emacs-mule))

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 6a24f21..449b32f 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -77,7 +77,7 @@ Integer values will in effect be rounded up to the nearest multiple of
   "*Length of each read operation when trying to fetch HEAD headers.")
 
 (defvar nnheader-read-timeout
-  (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+  (if (string-match "windows-nt\\|os/2\\|cygwin"
                    (symbol-name system-type))
       ;; http://thread.gmane.org/v9655t3pjo.fsf@marauder.physik.uni-ulm.de
       ;;
@@ -102,7 +102,7 @@ Shorter values mean quicker response, but are more CPU intensive.")
 (defvar nnheader-file-name-translation-alist
   (let ((case-fold-search t))
     (cond
-     ((string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+     ((string-match "windows-nt\\|os/2\\|cygwin"
                    (symbol-name system-type))
       (append (mapcar (lambda (c) (cons c ?_))
                      '(?: ?* ?\" ?< ?> ??))
@@ -786,8 +786,7 @@ If FULL, translate everything."
        ;; We translate -- but only the file name.  We leave the directory
        ;; alone.
        (if (and (featurep 'xemacs)
-                (memq system-type '(cygwin32 win32 w32 mswindows windows-nt
-                                             cygwin)))
+                (memq system-type '(windows-nt cygwin)))
            ;; This is needed on NT and stuff, because
            ;; file-name-nondirectory is not enough to split
            ;; file names, containing ':', e.g.

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 8bf0cbf..456f2d9 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -265,7 +265,7 @@ It scans low-level sorted spools even when not required."
   :type 'function)
 
 (defcustom nnmail-crosspost-link-function
-  (if (string-match "windows-nt\\|emx" (symbol-name system-type))
+  (if (string-match "windows-nt" (symbol-name system-type))
       'copy-file
     'add-name-to-file)
   "*Function called to create a copy of a file.

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 20f7ba3..682959a 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -120,7 +120,7 @@ Used for APOP authentication.")
       (defalias 'pop3-accept-process-output 'nnheader-accept-process-output)
     ;; Borrowed from `nnheader.el':
     (defvar pop3-read-timeout
-      (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+      (if (string-match "windows-nt\\|os/2\\|cygwin"
                        (symbol-name system-type))
          1.0
        0.01)