[Emacs-diffs] Changes to emacs/lisp/w32-fns.el

[Jason Rumney]

Index: emacs/lisp/w32-fns.el
diff -c emacs/lisp/w32-fns.el:1.47 emacs/lisp/w32-fns.el:1.48
*** emacs/lisp/w32-fns.el:1.47  Tue Nov 20 17:14:20 2001
--- emacs/lisp/w32-fns.el       Sun Jan 20 10:33:07 2002
***************
*** 53,63 ****
  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")))
--- 53,58 ----
***************
*** 82,90 ****
                   '("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
--- 77,82 ----
***************
*** 433,444 ****
  ;;; Note this value is overridden below.
  (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.
--- 425,430 ----