diff options
Diffstat (limited to 'lisp/w32-fns.el')
| -rw-r--r-- | lisp/w32-fns.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 28f268bf623..5b801e29831 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -1,6 +1,7 @@ ;;; w32-fns.el --- Lisp routines for Windows NT -;; Copyright (C) 1994, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Geoff Voelker <voelker@cs.washington.edu> ;; Keywords: internal @@ -34,6 +35,8 @@ ;;; Code: +(defvar explicit-shell-file-name) + ;; Map delete and backspace (define-key function-key-map [backspace] "\177") (define-key function-key-map [delete] "\C-d") @@ -60,7 +63,7 @@ That includes all Windows systems except for 9X/Me." (defun w32-shell-name () "Return the name of the shell being used." - (or (and (boundp 'explicit-shell-file-name) explicit-shell-file-name) + (or (bound-and-true-p explicit-shell-file-name) (getenv "ESHELL") (getenv "SHELL") (and (w32-using-nt) "cmd.exe") @@ -272,7 +275,7 @@ shell requires it (see `w32-shell-dos-semantics')." (defun set-w32-system-coding-system (coding-system) "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 +characters in them to the system. For a list of possible values of CODING-SYSTEM, use \\[list-coding-systems]. This function is provided for backward compatibility, since @@ -355,8 +358,8 @@ This function is provided for backward compatibility, since Creates entries in `w32-charset-info-alist'. XLFD-CHARSET is a string which will appear in the XLFD font name to identify the character set. WINDOWS-CHARSET is a symbol identifying -the Windows character set this maps to. For the list of possible -values, see the documentation for `w32-charset-info-alist'. CODEPAGE +the Windows character set this maps to. For the list of possible +values, see the documentation for `w32-charset-info-alist'. CODEPAGE can be a numeric codepage that Windows uses to display the character set, t for Unicode output with no codepage translation or nil for 8 bit output with no translation." @@ -421,7 +424,7 @@ bit output with no translation." (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 -clipboard as well. Optional PUSH is ignored on Windows." +clipboard as well. Optional PUSH is ignored on Windows." (if x-select-enable-clipboard (w32-set-clipboard-data text)) (setq x-last-selected-text text)) |