[Emacs-diffs] emacs/lisp ChangeLog hippie-exp.el lpr.el ls-li...

[Glenn Morris]

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

Modified files:
        lisp           : ChangeLog hippie-exp.el lpr.el ls-lisp.el 
                         ps-print.el startup.el 
        lisp/emulation : viper-ex.el 
        lisp/international: mule-cmds.el 
        lisp/net       : ange-ftp.el 
        lisp/obsolete  : fast-lock.el 

Log message:
        Remove code for defunct system-types emx, macos, mswindows,
        unisoft-unix, vax-vms, win32, w32.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15997&r2=1.15998
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/hippie-exp.el?cvsroot=emacs&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/lpr.el?cvsroot=emacs&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ls-lisp.el?cvsroot=emacs&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ps-print.el?cvsroot=emacs&r1=1.227&r2=1.228
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.533&r2=1.534
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-ex.el?cvsroot=emacs&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.364&r2=1.365
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/ange-ftp.el?cvsroot=emacs&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/obsolete/fast-lock.el?cvsroot=emacs&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15997
retrieving revision 1.15998
diff -u -b -r1.15997 -r1.15998
--- ChangeLog   22 Aug 2009 19:58:13 -0000      1.15997
+++ ChangeLog   22 Aug 2009 21:59:40 -0000      1.15998
@@ -1,5 +1,17 @@
 2009-08-22  Glenn Morris  <address@hidden>
 
+       * 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.
 

Index: hippie-exp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/hippie-exp.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- hippie-exp.el       5 Jan 2009 03:19:19 -0000       1.40
+++ hippie-exp.el       22 Aug 2009 21:59:44 -0000      1.41
@@ -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 <address@hidden>
 ;; Last change: 3 March 1998
@@ -519,7 +519,7 @@
 (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))) ?/))

Index: lpr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/lpr.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- lpr.el      5 Jan 2009 03:19:31 -0000       1.81
+++ lpr.el      22 Aug 2009 21:59:44 -0000      1.82
@@ -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.\)
 

Index: ls-lisp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ls-lisp.el,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- ls-lisp.el  27 Mar 2009 18:34:03 -0000      1.82
+++ ls-lisp.el  22 Aug 2009 21:59:44 -0000      1.83
@@ -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 @@
   :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

Index: ps-print.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ps-print.el,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- ps-print.el 21 Jul 2009 04:49:51 -0000      1.227
+++ ps-print.el 22 Aug 2009 21:59:44 -0000      1.228
@@ -1478,7 +1478,7 @@
 
 
 (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)))
 

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -b -r1.533 -r1.534
--- startup.el  22 Aug 2009 19:29:25 -0000      1.533
+++ startup.el  22 Aug 2009 21:59:44 -0000      1.534
@@ -741,13 +741,9 @@
   ;; 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)")))

Index: emulation/viper-ex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-ex.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- emulation/viper-ex.el       5 Jan 2009 03:21:20 -0000       1.76
+++ emulation/viper-ex.el       22 Aug 2009 21:59:44 -0000      1.77
@@ -329,7 +329,6 @@
 
 (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
        )

Index: international/mule-cmds.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -b -r1.364 -r1.365
--- international/mule-cmds.el  12 Aug 2009 20:43:08 -0000      1.364
+++ international/mule-cmds.el  22 Aug 2009 21:59:45 -0000      1.365
@@ -1968,7 +1968,6 @@
         (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

Index: net/ange-ftp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/ange-ftp.el,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- net/ange-ftp.el     5 Apr 2009 17:49:47 -0000       1.106
+++ net/ange-ftp.el     22 Aug 2009 21:59:45 -0000      1.107
@@ -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 (address@hidden)
 ;; Maintainer: FSF
@@ -3220,7 +3221,7 @@
               ;; 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))

Index: obsolete/fast-lock.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/obsolete/fast-lock.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- obsolete/fast-lock.el       5 Jan 2009 03:22:56 -0000       1.22
+++ obsolete/fast-lock.el       22 Aug 2009 21:59:45 -0000      1.23
@@ -549,7 +549,7 @@
       (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