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.

diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index 4ac734ed3d368f4c09b55183df05059b78685027..0d98dc81c1eee10704240382abc820f5c340cfa7 100644 (file)
--- 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 ceeb42b91822ee68c09678246e77cc7f5eee8a32..f60a6a4377474c836dcb36667261c24af771692f 100644 (file)
--- 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 3e944d99e7fb66f028988b64567c89660936f15b..745d5fadf6298731eeff0435e5240a32501a75a6 100644 (file)
--- 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 fac9c77e12a980ae88fd64271e4311420df0b481..f408e835769fcd5c74a68a9bf8dd364b8633d726 100644 (file)
--- 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 edc71ea859bb671cec88b0b84910f1797ffb0fbe..ca067033e6347e8d35c40b90bfde7f4a9fa69c0f 100644 (file)
--- 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 e6fd6095dc21b4f7a3cecf3ea6cf7bb63dd5cb46..e32b41f5750be8eda5553f98beed7ca85c25afdf 100644 (file)
--- 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 648485b4f611dbfba7cbf2ff9c3d41d6f063acc7..cc3dccea25f50386167f4aa50b9d35a4edb20e8d 100644 (file)
--- 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/v9655t3pjo.fsf@marauder.physik.uni-ulm.de
       ;;
       ;; 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 ada2c477e9efdd1e18c6d8a5b330a502fbb33197..7b293921a43e6ad86942a480e6db505ae5c335a7 100644 (file)
--- 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 6230a15c85b823b4b1882deb600aada6f26553d7..2ef63217256c8beb3b430b46f486175d672b930c 100644 (file)
--- 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 f4cb478e028d305341d9e85a58a4f06c54fcc14b..23ea91fe95b69c072bd9a0f613d86175772e21d0 100644 (file)
--- 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 b27d76bab5d3c0f86c454d6dc8c78dd1e279dfb8..90dfb2751326562f3af68a9368928df8a363d62c 100644 (file)
--- 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 d6c4667da46d1cdecbf597ca9322cd7f7d5c9869..f08779f6950f1d60afd7fbc778bfe203b962261d 100644 (file)
--- 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 75cf77deaa4ecb8df9c221881157b103c8d43fe8..be6377ceb3abd67ece0c37cc45c3ed37a7921759 100644 (file)
--- 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 549066e1eca0fb1f6580a107cbc64b10048ad18d..aea5f76d4fce450a9f57b441bd71dbf7478cfd45 100644 (file)
--- 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: