X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b9345dfd4b5479ec624f1870723a8ea5c9c719e7..b847032c75e0cb4041a8736886e7054beb6f8696:/lisp/w32-fns.el

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index a002a63e3f..aff2df3dc7 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -1,6 +1,6 @@
 ;;; w32-fns.el --- Lisp routines for 32-bit Windows
 
-;; Copyright (C) 1994, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
@@ -161,7 +161,7 @@ You should set this to t when using a non-system shell.\n\n"))))
 (add-hook 'before-init-hook 'set-default-process-coding-system)
 
 
-;;; Basic support functions for managing Emacs' locale setting
+;;; Basic support functions for managing Emacs's locale setting
 
 (defvar w32-valid-locales nil
   "List of locale ids known to be supported.")
@@ -335,6 +335,8 @@ This function is provided for backward compatibility, since
 (global-set-key [lwindow] 'ignore)
 (global-set-key [rwindow] 'ignore)
 
+(defvar w32-charset-info-alist)		; w32font.c
+
 (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'.
@@ -379,10 +381,10 @@ bit output with no translation."
 (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)
 (w32-add-charset-info "iso10646-1" 'w32-charset-default t)
 
-;;   ;; If unicode windows charset is not defined, use ansi fonts.
+;;   ;; If Unicode Windows charset is not defined, use ansi fonts.
 ;;   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
 
-;; Prefered names
+;; Preferred names
 (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950)
 (w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936)
 (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)