Update PostScript version.

[gnu-emacs] / lisp / w32-fns.el

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 7dd98e49e303bffadf7300e628cdfaa1a073ac67..3c643533cc19b542ab8248282a6884bdedd3c4e9 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -53,11 +53,6 @@ The value is a list of three integers: the major and minor version
 numbers, and the build number."
   (x-server-version))
 
-(defvar w32-system-shells '("cmd" "cmd.exe" "command" "command.com"
-                           "4nt" "4nt.exe" "4dos" "4dos.exe"
-                           "ndos" "ndos.exe")
-  "List of strings recognized as Windows NT/9X system shells.")
-
 (defun w32-using-nt ()
   "Return non-nil if literally running on Windows NT (i.e., not Windows 9X)."
   (and (eq system-type 'windows-nt) (getenv "SystemRoot")))
@@ -82,9 +77,6 @@ numbers, and the build number."
                   '("cmdproxy" "cmdproxy.exe"))
           (w32-system-shell-p (getenv "COMSPEC")))))
 
-(defvar w32-allow-system-shell nil
-  "*Disable startup warning when using \"system\" shells.")
-
 (defun w32-check-shell-configuration ()
   "Check the configuration of shell variables on Windows NT/9X.
 This function is invoked after loading the init files and processing
@@ -291,17 +283,22 @@ with a definition that really does change some file names."
   "Set the coding system used by the Windows System to CODING-SYSTEM.
 This is used for things like passing font names with non-ASCII
 characters in them to the system. For a list of possible values of
-CODING-SYSTEM, use \\[list-coding-systems]."
+CODING-SYSTEM, use \\[list-coding-systems].
+
+This function is provided for backward compatibility, since
+w32-system-coding-system is now an alias for `locale-coding-system'."
   (interactive
-   (list (let ((default w32-system-coding-system))
+   (list (let ((default locale-coding-system))
            (read-coding-system
             (format "Coding system for system calls (default, %s): "
                     default)
             default))))
   (check-coding-system coding-system)
-  (setq w32-system-coding-system coding-system))
-;; Set system coding system initially to iso-latin-1
-(set-w32-system-coding-system 'iso-latin-1)
+  (setq locale-coding-system coding-system))
+
+;; locale-coding-system was introduced to do the same thing as
+;; w32-system-coding-system. Use that instead.
+(defvaralias 'w32-system-coding-system 'locale-coding-system)
 
 ;;; Set to a system sound if you want a fancy bell.
 (set-message-beep nil)
@@ -344,22 +341,22 @@ CODING-SYSTEM, use \\[list-coding-systems]."
 ;; W32 uses different color indexes than standard:
 
 (defvar w32-tty-standard-colors
-  '(("white"         15 65535 65535 65535)
-    ("yellow"        14 65535 65535     0) ; Yellow
-    ("lightmagenta"  13 65535     0 65535) ; Magenta
-    ("lightred"      12 65535     0     0) ; Red
-    ("lightcyan"     11     0 65535 65535) ; Cyan
-    ("lightgreen"    10     0 65535     0) ; Green
-    ("lightblue"      9     0     0 65535) ; Blue
-    ("darkgray"       8 26112 26112 26112) ; Gray40
-    ("lightgray"      7 48640 48640 48640) ; Gray
-    ("brown"          6 40960 20992 11520) ; Sienna
-    ("magenta"        5 35584     0 35584) ; DarkMagenta
-    ("red"            4 45568  8704  8704) ; FireBrick
-    ("cyan"           3     0 52736 53504) ; DarkTurquoise
-    ("green"          2  8704 35584  8704) ; ForestGreen
+  '(("black"          0     0     0     0)
     ("blue"           1     0     0 52480) ; MediumBlue
-    ("black"          0     0     0     0))
+    ("green"          2  8704 35584  8704) ; ForestGreen
+    ("cyan"           3     0 52736 53504) ; DarkTurquoise
+    ("red"            4 45568  8704  8704) ; FireBrick
+    ("magenta"        5 35584     0 35584) ; DarkMagenta
+    ("brown"          6 40960 20992 11520) ; Sienna
+    ("lightgray"      7 48640 48640 48640) ; Gray
+    ("darkgray"       8 26112 26112 26112) ; Gray40
+    ("lightblue"      9     0     0 65535) ; Blue
+    ("lightgreen"    10     0 65535     0) ; Green
+    ("lightcyan"     11     0 65535 65535) ; Cyan
+    ("lightred"      12 65535     0     0) ; Red
+    ("lightmagenta"  13 65535     0 65535) ; Magenta
+    ("yellow"        14 65535 65535     0) ; Yellow
+    ("white"         15 65535 65535 65535))
 "A list of VGA console colors, their indices and 16-bit RGB values.")
 
 
@@ -429,12 +426,6 @@ bit output with no translation."
 (defvar x-cut-buffer-max 20000
   "Max number of characters to put in the cut buffer.")
 
-(defcustom x-select-enable-clipboard t
-  "Non-nil means cutting and pasting uses the clipboard.
-This is in addition to the primary selection."
-  :type 'boolean
-  :group 'killing)
-
 (defun x-select-text (text &optional push)
   "Make TEXT the last selected text.
 If `x-select-enable-clipboard' is non-nil, copy the text to the system