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

[Juanma Barranquero]

Index: emacs/lisp/w32-fns.el
diff -c emacs/lisp/w32-fns.el:1.55 emacs/lisp/w32-fns.el:1.56
*** emacs/lisp/w32-fns.el:1.55  Mon Jul  4 23:09:00 2005
--- emacs/lisp/w32-fns.el       Thu Jul 21 10:51:10 2005
***************
*** 1,6 ****
  ;;; w32-fns.el --- Lisp routines for Windows NT
  
! ;; Copyright (C) 1994, 2001, 2004 Free Software Foundation, Inc.
  
  ;; Author: Geoff Voelker <address@hidden>
  ;; Keywords: internal
--- 1,6 ----
  ;;; w32-fns.el --- Lisp routines for Windows NT
  
! ;; Copyright (C) 1994, 2001, 2004, 2005 Free Software Foundation, Inc.
  
  ;; Author: Geoff Voelker <address@hidden>
  ;; Keywords: internal
***************
*** 60,66 ****
  
  (defun w32-shell-name ()
    "Return the name of the shell being used."
!   (or (and (boundp 'explicit-shell-file-name) explicit-shell-file-name)
        (getenv "ESHELL")
        (getenv "SHELL")
        (and (w32-using-nt) "cmd.exe")
--- 60,66 ----
  
  (defun w32-shell-name ()
    "Return the name of the shell being used."
!   (or (bound-and-true-p explicit-shell-file-name)
        (getenv "ESHELL")
        (getenv "SHELL")
        (and (w32-using-nt) "cmd.exe")
***************
*** 272,278 ****
  (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
  CODING-SYSTEM, use \\[list-coding-systems].
  
  This function is provided for backward compatibility, since
--- 272,278 ----
  (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
  CODING-SYSTEM, use \\[list-coding-systems].
  
  This function is provided for backward compatibility, since
***************
*** 355,362 ****
  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
  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."
--- 355,362 ----
  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
  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,427 ****
  (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."
    (if x-select-enable-clipboard
        (w32-set-clipboard-data text))
    (setq x-last-selected-text text))
--- 421,427 ----
  (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."
    (if x-select-enable-clipboard
        (w32-set-clipboard-data text))
    (setq x-last-selected-text text))