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

[Miles Bader]

Index: emacs/lisp/w32-fns.el
diff -c emacs/lisp/w32-fns.el:1.51.6.3 emacs/lisp/w32-fns.el:1.51.6.4
*** emacs/lisp/w32-fns.el:1.51.6.3      Fri Apr 16 12:50:11 2004
--- emacs/lisp/w32-fns.el       Mon Jun 28 07:28:47 2004
***************
*** 1,6 ****
  ;;; w32-fns.el --- Lisp routines for Windows NT
  
! ;; Copyright (C) 1994, 2001 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 Free Software Foundation, Inc.
  
  ;; Author: Geoff Voelker <address@hidden>
  ;; Keywords: internal
***************
*** 54,60 ****
    (x-server-version))
  
  (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")))
  
  (defun w32-shell-name ()
--- 54,61 ----
    (x-server-version))
  
  (defun w32-using-nt ()
!   "Return non-nil if running on a 32-bit Windows system.
! That includes all Windows systems except for 9X/Me."
    (and (eq system-type 'windows-nt) (getenv "SystemRoot")))
  
  (defun w32-shell-name ()
***************
*** 71,77 ****
               w32-system-shells)))
  
  (defun w32-shell-dos-semantics ()
!   "Return t if the interactive shell being used expects msdos shell 
semantics."
    (or (w32-system-shell-p (w32-shell-name))
        (and (member (downcase (file-name-nondirectory (w32-shell-name)))
                   '("cmdproxy" "cmdproxy.exe"))
--- 72,78 ----
               w32-system-shells)))
  
  (defun w32-shell-dos-semantics ()
!   "Return non-nil if the interactive shell being used expects MSDOS shell 
semantics."
    (or (w32-system-shell-p (w32-shell-name))
        (and (member (downcase (file-name-nondirectory (w32-shell-name)))
                   '("cmdproxy" "cmdproxy.exe"))
***************
*** 229,237 ****
  
  (defun convert-standard-filename (filename)
    "Convert a standard file's name to something suitable for the current OS.
! This function's standard definition is trivial; it just returns the argument.
! However, on some systems, the function is redefined
! with a definition that really does change some file names."
    (let ((name
           (save-match-data
             (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename)
--- 230,242 ----
  
  (defun convert-standard-filename (filename)
    "Convert a standard file's name to something suitable for the current OS.
! This means to guarantee valid names and perhaps to canonicalize
! certain patterns.
! 
! On Windows and DOS, replace invalid characters.  On DOS, make
! sure to obey the 8.3 limitations.  On Windows, turn Cygwin names
! into native names, and also turn slashes into backslashes if the
! shell requires it (see `w32-shell-dos-semantics')."
    (let ((name
           (save-match-data
             (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename)
***************
*** 265,277 ****
    (get 'x-selections type))
  
  (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
! w32-system-coding-system is now an alias for `locale-coding-system'."
    (interactive
     (list (let ((default locale-coding-system))
             (read-coding-system
--- 270,282 ----
    (get 'x-selections type))
  
  (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
! `w32-system-coding-system' is now an alias for `locale-coding-system'."
    (interactive
     (list (let ((default locale-coding-system))
             (read-coding-system