Merge from emacs-24; up to 2014-07-04T02:28:54Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / term / w32console.el

diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index ceaa936e79b9afa911fb3bd9cedee4bd5ae935a1..96e234bbcf9426b9fddc906811239312fd2da0bc 100644 (file)
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -1,6 +1,6 @@
 ;;; w32console.el -- Setup w32 console keys and colors.
 
-;; Copyright (C) 2007-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -47,6 +47,8 @@
 
 (declare-function x-setup-function-keys "term/common-win" (frame))
 (declare-function get-screen-color "w32console.c" ())
+(declare-function w32-get-console-codepage "w32proc.c" ())
+(declare-function w32-get-console-output-codepage "w32proc.c" ())
 
 (defun terminal-init-w32console ()
   "Terminal initialization function for w32 console."