summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-04-08 13:16:08 -0700
committerGlenn Morris <rgm@gnu.org>2017-04-08 13:16:08 -0700
commitbca1fde85f44d0cb04aec25b0a93d37bbd757460 (patch)
tree1fbc47f3b0b15acbfddb73eacf61ad58940ede79 /lisp/emulation
parentb7d61609bd2a5a97b63733a4c16194850e48de2a (diff)
downloademacs-bca1fde85f44d0cb04aec25b0a93d37bbd757460.tar.gz
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.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/viper-ex.el3
-rw-r--r--lisp/emulation/viper-util.el7
2 files changed, 1 insertions, 9 deletions
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index edc71ea859b..ca067033e63 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 e6fd6095dc2..e32b41f5750 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)