aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2004-05-28 19:14:50 +0000
committerJuanma Barranquero2004-05-28 19:14:50 +0000
commit49bd2bfeb42a9ae6b46ec0069514d2d5ebec8514 (patch)
tree6628db4a81aaca2670441b22aeca074f6ac71c51
parent287aae6ce97e0a6bfd62ef259d2f9a44f00c547e (diff)
downloademacs-49bd2bfeb42a9ae6b46ec0069514d2d5ebec8514.tar.gz
emacs-49bd2bfeb42a9ae6b46ec0069514d2d5ebec8514.zip
(w32-using-nt, w32-shell-dos-semantics, set-w32-system-coding-system):
Doc fixes.
-rw-r--r--lisp/w32-fns.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 172af902cb9..4a485414d7a 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -1,6 +1,6 @@
1;;; w32-fns.el --- Lisp routines for Windows NT 1;;; w32-fns.el --- Lisp routines for Windows NT
2 2
3;; Copyright (C) 1994, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 1994, 2001, 2004 Free Software Foundation, Inc.
4 4
5;; Author: Geoff Voelker <voelker@cs.washington.edu> 5;; Author: Geoff Voelker <voelker@cs.washington.edu>
6;; Keywords: internal 6;; Keywords: internal
@@ -54,7 +54,8 @@ numbers, and the build number."
54 (x-server-version)) 54 (x-server-version))
55 55
56(defun w32-using-nt () 56(defun w32-using-nt ()
57 "Return non-nil if literally running on Windows NT (i.e., not Windows 9X)." 57 "Return non-nil if running on a 32-bit Windows system.
58That includes all Windows systems except for 9X/Me."
58 (and (eq system-type 'windows-nt) (getenv "SystemRoot"))) 59 (and (eq system-type 'windows-nt) (getenv "SystemRoot")))
59 60
60(defun w32-shell-name () 61(defun w32-shell-name ()
@@ -71,7 +72,7 @@ numbers, and the build number."
71 w32-system-shells))) 72 w32-system-shells)))
72 73
73(defun w32-shell-dos-semantics () 74(defun w32-shell-dos-semantics ()
74 "Return t if the interactive shell being used expects msdos shell semantics." 75 "Return non-nil if the interactive shell being used expects MSDOS shell semantics."
75 (or (w32-system-shell-p (w32-shell-name)) 76 (or (w32-system-shell-p (w32-shell-name))
76 (and (member (downcase (file-name-nondirectory (w32-shell-name))) 77 (and (member (downcase (file-name-nondirectory (w32-shell-name)))
77 '("cmdproxy" "cmdproxy.exe")) 78 '("cmdproxy" "cmdproxy.exe"))
@@ -265,13 +266,13 @@ with a definition that really does change some file names."
265 (get 'x-selections type)) 266 (get 'x-selections type))
266 267
267(defun set-w32-system-coding-system (coding-system) 268(defun set-w32-system-coding-system (coding-system)
268 "Set the coding system used by the Windows System to CODING-SYSTEM. 269 "Set the coding system used by the Windows system to CODING-SYSTEM.
269This is used for things like passing font names with non-ASCII 270This is used for things like passing font names with non-ASCII
270characters in them to the system. For a list of possible values of 271characters in them to the system. For a list of possible values of
271CODING-SYSTEM, use \\[list-coding-systems]. 272CODING-SYSTEM, use \\[list-coding-systems].
272 273
273This function is provided for backward compatibility, since 274This function is provided for backward compatibility, since
274w32-system-coding-system is now an alias for `locale-coding-system'." 275`w32-system-coding-system' is now an alias for `locale-coding-system'."
275 (interactive 276 (interactive
276 (list (let ((default locale-coding-system)) 277 (list (let ((default locale-coding-system))
277 (read-coding-system 278 (read-coding-system