Commit a3374680 authored by Glenn Morris's avatar Glenn Morris
Browse files

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

unisoft-unix, vax-vms, win32, w32.
parent 3f12e3f4
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.
......
......@@ -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
)
......
;;; 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))) ?/))
......
......@@ -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
......
......@@ -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.\)
......
......@@ -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
......
;;; 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))
......
......@@ -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
......
......@@ -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)))
......
......@@ -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)")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment