Prevent server-mode from issuing a prompt in kill-emacs-hook.

[gnu-emacs] / lisp / w32-fns.el

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 003276c5eb130e60f365be0714ded0fd99082b61..efdf26b529c2e4ca0fa58065a5e3d599bbfd790a 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -1,7 +1,7 @@
 ;;; w32-fns.el --- Lisp routines for Windows NT
 
-;; Copyright (C) 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
@@ -34,13 +34,6 @@
 (defvar x-alternatives-map
   (let ((map (make-sparse-keymap)))
     ;; Map certain keypad keys into ASCII characters that people usually expect.
-    (define-key map [backspace] [127])
-    (define-key map [delete] [127])
-    (define-key map [tab] [?\t])
-    (define-key map [linefeed] [?\n])
-    (define-key map [clear] [?\C-l])
-    (define-key map [return] [?\C-m])
-    (define-key map [escape] [?\e])
     (define-key map [M-backspace] [?\M-\d])
     (define-key map [M-delete] [?\M-\d])
     (define-key map [M-tab] [?\M-\t])
@@ -176,20 +169,20 @@ You should set this to t when using a non-system shell.\n\n"))))
   ;; (and some programs ported from Unix require it) but most will
   ;; produce DOS line endings on output.
   (setq default-process-coding-system
-       (if default-enable-multibyte-characters
+       (if (default-value 'enable-multibyte-characters)
            '(undecided-dos . undecided-unix)
          '(raw-text-dos . raw-text-unix)))
   ;; Make cmdproxy default to using DOS line endings for input,
   ;; because some Windows programs (including command.com) require it.
   (add-to-list 'process-coding-system-alist
               `("[cC][mM][dD][pP][rR][oO][xX][yY]"
-                . ,(if default-enable-multibyte-characters
+                . ,(if (default-value 'enable-multibyte-characters)
                        '(undecided-dos . undecided-dos)
                      '(raw-text-dos . raw-text-dos))))
   ;; plink needs DOS input when entering the password.
   (add-to-list 'process-coding-system-alist
               `("[pP][lL][iI][nN][kK]"
-                . ,(if default-enable-multibyte-characters
+                . ,(if (default-value 'enable-multibyte-characters)
                        '(undecided-dos . undecided-dos)
                      '(raw-text-dos . raw-text-dos)))))
 
@@ -369,16 +362,6 @@ This function is provided for backward compatibility, since
 (global-set-key [lwindow] 'ignore)
 (global-set-key [rwindow] 'ignore)
 
-;; These tell read-char how to convert
-;; these special chars to ASCII.
-(put 'tab 'ascii-character ?\t)
-(put 'linefeed 'ascii-character ?\n)
-(put 'clear 'ascii-character 12)
-(put 'return 'ascii-character 13)
-(put 'escape 'ascii-character ?\e)
-(put 'backspace 'ascii-character 127)
-(put 'delete 'ascii-character 127)
-
 (defun w32-add-charset-info (xlfd-charset windows-charset codepage)
   "Function to add character sets to display with Windows fonts.
 Creates entries in `w32-charset-info-alist'.
@@ -507,7 +490,9 @@ This is required because some Windows build environments, such as MSYS,
 munge command-line arguments that include file names to a horrible mess
 that Emacs is unable to cope with."
   (let ((generated-autoload-file
-        (expand-file-name (pop command-line-args-left))))
+        (expand-file-name (pop command-line-args-left)))
+       ;; I can only assume the same considerations may apply here...
+       (autoload-make-program (pop command-line-args-left)))
     (batch-update-autoloads)))
 
 (defun w32-append-code-lines (orig extra)