Commit bca1fde8 authored by Glenn Morris's avatar Glenn Morris

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.
parent b7d61609
...@@ -22,7 +22,7 @@ current operating systems Windows is in ...@@ -22,7 +22,7 @@ current operating systems Windows is in
@end ifnottex @end ifnottex
If you build Emacs for MS-DOS, the binary will also run on Windows 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 application; all of this chapter applies for all of those systems, if
you use an Emacs that was built for MS-DOS. you use an Emacs that was built for MS-DOS.
......
...@@ -26378,7 +26378,7 @@ read when doing the operation described above. ...@@ -26378,7 +26378,7 @@ read when doing the operation described above.
@cindex characters in file names @cindex characters in file names
This is an alist that says how to translate 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 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 @lisp
@group @group
...@@ -26387,7 +26387,7 @@ on your system (you OS/2 user you), you could say something like: ...@@ -26387,7 +26387,7 @@ on your system (you OS/2 user you), you could say something like:
@end group @end group
@end lisp @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. Windows (phooey) systems.
@item gnus-hidden-properties @item gnus-hidden-properties
...@@ -1767,7 +1767,7 @@ Function used by the command @kbd{#c<move>} to spell. ...@@ -1767,7 +1767,7 @@ Function used by the command @kbd{#c<move>} to spell.
@item viper-glob-function @item viper-glob-function
The value of this variable is the function symbol used to expand wildcard 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 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. 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 Use @code{viper-glob-unix-files} and @code{viper-glob-mswindows-files} in
@file{viper-util.el} as examples. @file{viper-util.el} as examples.
......
...@@ -3246,10 +3246,6 @@ Only match the specified window systems.") ...@@ -3246,10 +3246,6 @@ Only match the specified window systems.")
:sibling-args (:help-echo "\ :sibling-args (:help-echo "\
The X11 Window System.") The X11 Window System.")
x) x)
(const :format "PM "
:sibling-args (:help-echo "\
OS/2 Presentation Manager.")
pm)
(const :format "W32 " (const :format "W32 "
:sibling-args (:help-echo "\ :sibling-args (:help-echo "\
MS Windows.") MS Windows.")
......
...@@ -326,8 +326,7 @@ Don't put `-c' here, as it is added automatically." ...@@ -326,8 +326,7 @@ Don't put `-c' here, as it is added automatically."
(t 'viper-glob-unix-files) ; presumably UNIX (t 'viper-glob-unix-files) ; presumably UNIX
) )
"Expand the file spec containing wildcard symbols. "Expand the file spec containing wildcard symbols.
The default tries to set this variable to work with Unix, Windows, The default tries to set this variable to work with Unix or MS Windows.
and OS/2.
However, if it doesn't work right for some types of Unix shells or some OS, 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 the user should supply the appropriate function and set this variable to the
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
;; Compiler pacifier ;; Compiler pacifier
(defvar viper-overriding-map) (defvar viper-overriding-map)
(defvar pm-color-alist)
(defvar viper-minibuffer-current-face) (defvar viper-minibuffer-current-face)
(defvar viper-minibuffer-insert-face) (defvar viper-minibuffer-insert-face)
(defvar viper-minibuffer-vi-face) (defvar viper-minibuffer-vi-face)
...@@ -132,12 +131,6 @@ Otherwise return the normal value." ...@@ -132,12 +131,6 @@ Otherwise return the normal value."
(if fp (cdr fp) (if fp (cdr fp)
,variable))))) ,variable)))))
;; OS/2
(cond ((eq (viper-device-type) 'pm)
(fset 'viper-color-defined-p
(lambda (color) (assoc color pm-color-alist)))))
;; cursor colors ;; cursor colors
(defun viper-change-cursor-color (new-color &optional frame) (defun viper-change-cursor-color (new-color &optional frame)
(if (and (viper-window-display-p) (viper-color-display-p) (if (and (viper-window-display-p) (viper-color-display-p)
......
...@@ -82,8 +82,7 @@ Integer values will in effect be rounded up to the nearest multiple of ...@@ -82,8 +82,7 @@ Integer values will in effect be rounded up to the nearest multiple of
:type 'integer) :type 'integer)
(defvar nnheader-read-timeout (defvar nnheader-read-timeout
(if (string-match "windows-nt\\|os/2\\|cygwin" (if (memq system-type '(windows-nt cygwin))
(symbol-name system-type))
;; http://thread.gmane.org/v9655t3pjo.fsf@marauder.physik.uni-ulm.de ;; 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. ;; 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 ...@@ -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.") Shorter values mean quicker response, but are more CPU intensive.")
(defcustom nnheader-file-name-translation-alist (defcustom nnheader-file-name-translation-alist
(let ((case-fold-search t)) (if (memq system-type '(windows-nt cygwin))
(cond (mapcar (lambda (c) (cons c ?_)) '(?: ?* ?\" ?< ?> ??)))
((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)))
"Alist that says how to translate characters in file names. "Alist that says how to translate characters in file names.
For instance, if \":\" is invalid as a file character in file names For instance, if \":\" is invalid as a file character in file names
on your system, you could say something like: on your system, you could say something like:
......
...@@ -249,9 +249,7 @@ See also `imap-log'." ...@@ -249,9 +249,7 @@ See also `imap-log'."
:group 'imap :group 'imap
:type 'string) :type 'string)
(defcustom imap-read-timeout (if (string-match (defcustom imap-read-timeout (if (memq system-type '(windows-nt cygwin))
"windows-nt\\|os/2\\|cygwin"
(symbol-name system-type))
1.0 1.0
0.1) 0.1)
"How long to wait between checking for the end of output. "How long to wait between checking for the end of output.
......
...@@ -159,8 +159,7 @@ Used for APOP authentication.") ...@@ -159,8 +159,7 @@ Used for APOP authentication.")
(defalias 'pop3-accept-process-output 'nnheader-accept-process-output) (defalias 'pop3-accept-process-output 'nnheader-accept-process-output)
;; Borrowed from `nnheader.el': ;; Borrowed from `nnheader.el':
(defvar pop3-read-timeout (defvar pop3-read-timeout
(if (string-match "windows-nt\\|os/2\\|cygwin" (if (memq system-type '(windows-nt cygwin))
(symbol-name system-type))
1.0 1.0
0.01) 0.01)
"How long pop3 should wait between checking for the end of output. "How long pop3 should wait between checking for the end of output.
......
...@@ -1922,10 +1922,7 @@ or as help on variables `cperl-tips', `cperl-problems', ...@@ -1922,10 +1922,7 @@ or as help on variables `cperl-tips', `cperl-problems',
(perldb (read-from-minibuffer "Run perldb (like this): " (perldb (read-from-minibuffer "Run perldb (like this): "
(if (consp gud-perldb-history) (if (consp gud-perldb-history)
(car gud-perldb-history) (car gud-perldb-history)
(concat "perl " ;;(file-name-nondirectory (concat "perl "
;; I have problems
;; in OS/2
;; otherwise
(buffer-file-name))) (buffer-file-name)))
nil nil nil nil
'(gud-perldb-history . 1)))) '(gud-perldb-history . 1))))
...@@ -6644,7 +6641,6 @@ Customized by setting variables `cperl-shrink-wrap-info-frame', ...@@ -6644,7 +6641,6 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
(if not-loner (if not-loner
(/ (* (- frheight 3) cperl-max-help-size) 100) (/ (* (- frheight 3) cperl-max-help-size) 100)
(setq char-height (frame-char-height)) (setq char-height (frame-char-height))
;; Non-functioning under OS/2:
(if (eq char-height 1) (setq char-height 18)) (if (eq char-height 1) (setq char-height 18))
;; Title, menubar, + 2 for slack ;; Title, menubar, + 2 for slack
(- (/ (display-pixel-height) char-height) 4))) (- (/ (display-pixel-height) char-height) 4)))
...@@ -7010,7 +7006,7 @@ Does not move point." ...@@ -7010,7 +7006,7 @@ Does not move point."
(setq pos (point)) (setq pos (point))
(goto-char 1) (goto-char 1)
(setq rel file) (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) (set-text-properties 0 (length rel) nil rel)
(and (equal topdir (substring rel 0 (length topdir))) (and (equal topdir (substring rel 0 (length topdir)))
(setq rel (substring file (length topdir)))) (setq rel (substring file (length topdir))))
...@@ -7103,7 +7099,7 @@ Use as ...@@ -7103,7 +7099,7 @@ Use as
(t (t
(goto-char 1) (goto-char 1)
(setq rel file) (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) (set-text-properties 0 (length rel) nil rel)
(and (equal topdir (substring rel 0 (length topdir))) (and (equal topdir (substring rel 0 (length topdir)))
(setq rel (substring file (length topdir)))) (setq rel (substring file (length topdir))))
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
((eq system-type 'windows-nt) "Windows-NT; 32bit") ((eq system-type 'windows-nt) "Windows-NT; 32bit")
((eq system-type 'ms-dos) "MS-DOS; 32bit") ((eq system-type 'ms-dos) "MS-DOS; 32bit")
((memq (url-device-type) '(win32 w32)) "Windows; 32bit") ((memq (url-device-type) '(win32 w32)) "Windows; 32bit")
((eq (url-device-type) 'pm) "OS/2; 32bit")
(t (t
(pcase (url-device-type) (pcase (url-device-type)
(`x "X11") (`x "X11")
......
...@@ -410,10 +410,6 @@ Should be one of: ...@@ -410,10 +410,6 @@ Should be one of:
:group 'url :group 'url
:type 'hook) :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") (defconst url-working-buffer " *url-work")
(defvar url-gateway-unplugged nil (defvar url-gateway-unplugged nil
......
...@@ -58,9 +58,6 @@ This is to avoid conflict with user settings if URL is dumped with ...@@ -58,9 +58,6 @@ This is to avoid conflict with user settings if URL is dumped with
Emacs." Emacs."
(unless url-setup-done (unless url-setup-done
;; Make OS/2 happy
;;(push '("http" "80") tcp-binary-process-input-services)
(mailcap-parse-mailcaps) (mailcap-parse-mailcaps)
(mailcap-parse-mimetypes) (mailcap-parse-mimetypes)
......
...@@ -3277,16 +3277,14 @@ Hit \\[ediff-recenter] to reset the windows afterward." ...@@ -3277,16 +3277,14 @@ Hit \\[ediff-recenter] to reset the windows afterward."
file)) file))
;; Quote metacharacters (using \) when executing diff in Unix, but not in ;; Quote metacharacters (using \) when executing diff in Unix.
;; EMX OS/2
;;(defun ediff-protect-metachars (str) ;;(defun ediff-protect-metachars (str)
;; (or (memq system-type '(emx)) ;; (let ((limit 0))
;; (let ((limit 0)) ;; (while (string-match ediff-metachars str limit)
;; (while (string-match ediff-metachars str limit) ;; (setq str (concat (substring str 0 (match-beginning 0))
;; (setq str (concat (substring str 0 (match-beginning 0)) ;; "\\"
;; "\\" ;; (substring str (match-beginning 0))))
;; (substring str (match-beginning 0)))) ;; (setq limit (1+ (match-end 0)))))
;; (setq limit (1+ (match-end 0))))))
;; str) ;; str)
;; Make sure the current buffer (for a file) has the same contents as the ;; 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, ...@@ -4059,7 +4057,7 @@ interfaces to several other packages and runs under Emacs and XEmacs,
byte-compilation may produce output like this: byte-compilation may produce output like this:
While compiling toplevel forms in file ediff.el: 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: While compiling the end of the data:
** The following functions are not known to be defined: ** The following functions are not known to be defined:
......
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