[Emacs-diffs] master bca1fde: Remove references to OS/2 in code, doc, and comments

[Glenn Morris]

branch: master
commit bca1fde85f44d0cb04aec25b0a93d37bbd757460
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Remove references to OS/2 in code, doc, and comments
    
    * lisp/gnus/nnheader.el (nnheader-read-timeout)
    (nnheader-file-name-translation-alist): Remove OS/2 case, and simplify.
    * lisp/emulation/viper-util.el (viper-color-defined-p):
    * lisp/net/pop3.el (pop3-read-timeout):
    * lisp/net/imap.el (imap-read-timeout):
    * lisp/url/url-privacy.el (url-setup-privacy-info): Remove OS/2 case.
    * lisp/emulation/viper-ex.el (viper-glob-function):
    * lisp/vc/ediff-util.el (ediff-submit-report): Doc fix.
    * lisp/cus-edit.el (custom-display): Remove "pm" (OS/2).
    * doc/emacs/msdos-xtra.texi (MS-DOS):
    * doc/misc/gnus.texi (Various Various):
    * doc/misc/viper.texi (Rudimentary Changes): Remove mentions of OS/2.
    ; * lisp/url/url.el, lisp/url/url-vars.el:
    ; * lisp/progmodes/cperl-mode.el: Remove old comments.
---
 doc/emacs/msdos-xtra.texi    |  2 +-
 doc/misc/gnus.texi           |  4 ++--
 doc/misc/viper.texi          |  2 +-
 lisp/cus-edit.el             |  4 ----
 lisp/emulation/viper-ex.el   |  3 +--
 lisp/emulation/viper-util.el |  7 -------
 lisp/gnus/nnheader.el        | 16 +++-------------
 lisp/net/imap.el             |  4 +---
 lisp/net/pop3.el             |  3 +--
 lisp/progmodes/cperl-mode.el | 10 +++-------
 lisp/url/url-privacy.el      |  1 -
 lisp/url/url-vars.el         |  4 ----
 lisp/url/url.el              |  3 ---
 lisp/vc/ediff-util.el        | 18 ++++++++----------
 14 files changed, 21 insertions(+), 60 deletions(-)

diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index 4ac734e..0d98dc8 100644
--- a/doc/emacs/msdos-xtra.texi
+++ b/doc/emacs/msdos-xtra.texi
@@ -22,7 +22,7 @@ current operating systems Windows is in
 @end ifnottex
 
   If you build Emacs for MS-DOS, the binary will also run on Windows
-3.X, Windows NT, Windows 9X/ME, Windows 2000/XP, or OS/2 as a DOS
+3.X, Windows NT, Windows 9X/ME, or Windows 2000/XP as a DOS
 application; all of this chapter applies for all of those systems, if
 you use an Emacs that was built for MS-DOS.
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index ceeb42b..f60a6a4 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -26378,7 +26378,7 @@ read when doing the operation described above.
 @cindex characters in file names
 This is an alist that says how to translate characters in file names.
 For instance, if @samp{:} is invalid as a file character in file names
-on your system (you OS/2 user you), you could say something like:
+on your system (you MS Windows user you), you could say something like:
 
 @lisp
 @group
@@ -26387,7 +26387,7 @@ on your system (you OS/2 user you), you could say 
something like:
 @end group
 @end lisp
 
-In fact, this is the default value for this variable on OS/2 and MS
+In fact, this is (part of) the default value for this variable on MS
 Windows (phooey) systems.
 
 @item gnus-hidden-properties
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 3e944d9..745d5fa 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -1767,7 +1767,7 @@ Function used by the command @kbd{#c<move>} to spell.
 @item viper-glob-function
 The value of this variable is the function symbol used to expand wildcard
 symbols. This is platform-dependent. The default tries to set this variable
-to work with most shells, MS Windows, OS/2, etc. However, if it
+to work with most shells, MS Windows, etc.  However, if it
 doesn't work the way you expect, you should write your own.
 Use @code{viper-glob-unix-files} and @code{viper-glob-mswindows-files} in
 @file{viper-util.el} as examples.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index fac9c77..f408e83 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3246,10 +3246,6 @@ Only match the specified window systems.")
                                           :sibling-args (:help-echo "\
 The X11 Window System.")
                                           x)
-                                   (const :format "PM "
-                                          :sibling-args (:help-echo "\
-OS/2 Presentation Manager.")
-                                          pm)
                                    (const :format "W32 "
                                           :sibling-args (:help-echo "\
 MS Windows.")
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index edc71ea..ca06703 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -326,8 +326,7 @@ Don't put `-c' here, as it is added automatically."
        (t  'viper-glob-unix-files) ; presumably UNIX
        )
   "Expand the file spec containing wildcard symbols.
-The default tries to set this variable to work with Unix, Windows,
-and OS/2.
+The default tries to set this variable to work with Unix or MS Windows.
 
 However, if it doesn't work right for some types of Unix shells or some OS,
 the user should supply the appropriate function and set this variable to the
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index e6fd609..e32b41f 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -29,7 +29,6 @@
 
 ;; Compiler pacifier
 (defvar viper-overriding-map)
-(defvar pm-color-alist)
 (defvar viper-minibuffer-current-face)
 (defvar viper-minibuffer-insert-face)
 (defvar viper-minibuffer-vi-face)
@@ -132,12 +131,6 @@ Otherwise return the normal value."
         (if fp (cdr fp)
           ,variable)))))
 
-;; OS/2
-(cond ((eq (viper-device-type) 'pm)
-       (fset 'viper-color-defined-p
-            (lambda (color) (assoc color pm-color-alist)))))
-
-
 ;; cursor colors
 (defun viper-change-cursor-color (new-color &optional frame)
   (if (and (viper-window-display-p)  (viper-color-display-p)
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 648485b..cc3dcce 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -82,8 +82,7 @@ Integer values will in effect be rounded up to the nearest 
multiple of
   :type 'integer)
 
 (defvar nnheader-read-timeout
-  (if (string-match "windows-nt\\|os/2\\|cygwin"
-                   (symbol-name system-type))
+  (if (memq system-type '(windows-nt cygwin))
       ;; http://thread.gmane.org/address@hidden
       ;;
       ;; IIRC, values lower than 1.0 didn't/don't work on Windows/DOS.
@@ -105,17 +104,8 @@ Integer values will in effect be rounded up to the nearest 
multiple of
 Shorter values mean quicker response, but are more CPU intensive.")
 
 (defcustom nnheader-file-name-translation-alist
-  (let ((case-fold-search t))
-    (cond
-     ((string-match "windows-nt\\|os/2\\|cygwin"
-                   (symbol-name system-type))
-      (append (mapcar (lambda (c) (cons c ?_))
-                     '(?: ?* ?\" ?< ?> ??))
-             (if (string-match "windows-nt\\|cygwin"
-                               (symbol-name system-type))
-                 nil
-               '((?+ . ?-)))))
-     (t nil)))
+  (if (memq system-type '(windows-nt cygwin))
+      (mapcar (lambda (c) (cons c ?_)) '(?: ?* ?\" ?< ?> ??)))
   "Alist that says how to translate characters in file names.
 For instance, if \":\" is invalid as a file character in file names
 on your system, you could say something like:
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index ada2c47..7b29392 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -249,9 +249,7 @@ See also `imap-log'."
   :group 'imap
   :type 'string)
 
-(defcustom imap-read-timeout (if (string-match
-                                 "windows-nt\\|os/2\\|cygwin"
-                                 (symbol-name system-type))
+(defcustom imap-read-timeout (if (memq system-type '(windows-nt cygwin))
                                 1.0
                               0.1)
   "How long to wait between checking for the end of output.
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index 6230a15..2ef6321 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -159,8 +159,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\\|cygwin"
-                       (symbol-name system-type))
+      (if (memq system-type '(windows-nt cygwin))
          1.0
        0.01)
       "How long pop3 should wait between checking for the end of output.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index f4cb478..23ea91f 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1922,10 +1922,7 @@ or as help on variables `cperl-tips', `cperl-problems',
   (perldb (read-from-minibuffer "Run perldb (like this): "
                                (if (consp gud-perldb-history)
                                    (car gud-perldb-history)
-                                 (concat "perl " ;;(file-name-nondirectory
-                                         ;; I have problems
-                                         ;; in OS/2
-                                         ;; otherwise
+                                 (concat "perl "
                                          (buffer-file-name)))
                                nil nil
                                '(gud-perldb-history . 1))))
@@ -6644,7 +6641,6 @@ Customized by setting variables 
`cperl-shrink-wrap-info-frame',
                       (if not-loner
                           (/ (* (- frheight 3) cperl-max-help-size) 100)
                         (setq char-height (frame-char-height))
-                        ;; Non-functioning under OS/2:
                         (if (eq char-height 1) (setq char-height 18))
                         ;; Title, menubar, + 2 for slack
                         (- (/ (display-pixel-height) char-height) 4)))
@@ -7010,7 +7006,7 @@ Does not move point."
        (setq pos (point))
        (goto-char 1)
        (setq rel file)
-       ;; On case-preserving filesystems (EMX on OS/2) case might be encoded 
in properties
+       ;; On case-preserving filesystems case might be encoded in properties
        (set-text-properties 0 (length rel) nil rel)
        (and (equal topdir (substring rel 0 (length topdir)))
             (setq rel (substring file (length topdir))))
@@ -7103,7 +7099,7 @@ Use as
                    (t
                     (goto-char 1)
                     (setq rel file)
-                    ;; On case-preserving filesystems (EMX on OS/2) case might 
be encoded in properties
+                    ;; On case-preserving filesystems case might be encoded in 
properties
                     (set-text-properties 0 (length rel) nil rel)
                     (and (equal topdir (substring rel 0 (length topdir)))
                          (setq rel (substring file (length topdir))))
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index b27d76b..90dfb27 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -43,7 +43,6 @@
         ((eq system-type 'windows-nt) "Windows-NT; 32bit")
         ((eq system-type 'ms-dos) "MS-DOS; 32bit")
         ((memq (url-device-type) '(win32 w32)) "Windows; 32bit")
-        ((eq (url-device-type) 'pm) "OS/2; 32bit")
         (t
          (pcase (url-device-type)
            (`x "X11")
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index d6c4667..f08779f 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -410,10 +410,6 @@ Should be one of:
   :group 'url
   :type 'hook)
 
-;;; Make OS/2 happy - yeeks
-;; (defvar     tcp-binary-process-input-services nil
-;;   "*Make OS/2 happy with our CRLF pairs...")
-
 (defconst url-working-buffer " *url-work")
 
 (defvar url-gateway-unplugged nil
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 75cf77d..be6377c 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -58,9 +58,6 @@ This is to avoid conflict with user settings if URL is dumped 
with
 Emacs."
   (unless url-setup-done
 
-    ;; Make OS/2 happy
-    ;;(push '("http" "80") tcp-binary-process-input-services)
-
     (mailcap-parse-mailcaps)
     (mailcap-parse-mimetypes)
 
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 549066e..aea5f76 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3277,16 +3277,14 @@ Hit \\[ediff-recenter] to reset the windows afterward."
     file))
 
 
-;; Quote metacharacters (using \) when executing diff in Unix, but not in
-;; EMX OS/2
+;; Quote metacharacters (using \) when executing diff in Unix.
 ;;(defun ediff-protect-metachars (str)
-;;  (or (memq system-type '(emx))
-;;      (let ((limit 0))
-;;     (while (string-match ediff-metachars str limit)
-;;       (setq str (concat (substring str 0 (match-beginning 0))
-;;                         "\\"
-;;                         (substring str (match-beginning 0))))
-;;       (setq limit (1+ (match-end 0))))))
+;;  (let ((limit 0))
+;;    (while (string-match ediff-metachars str limit)
+;;      (setq str (concat (substring str 0 (match-beginning 0))
+;;                     "\\"
+;;                     (substring str (match-beginning 0))))
+;;      (setq limit (1+ (match-end 0)))))
 ;;  str)
 
 ;; Make sure the current buffer (for a file) has the same contents as the
@@ -4059,7 +4057,7 @@ interfaces to several other packages and runs under Emacs 
and XEmacs,
 byte-compilation may produce output like this:
 
        While compiling toplevel forms in file ediff.el:
-        ** reference to free variable pm-color-alist
+        ** reference to free variable zzz
           ........................
        While compiling the end of the data:
         ** The following functions are not known to be defined: