From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 16 Oct 2008 15:28:29 +0000 (+0000)
Subject: * w32-fns.el (w32-check-shell-configuration): Doc fix.
X-Git-Tag: emacs-pretest-23.0.90~2441
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72ab66ebe39b5397539a054d042f592e44ef9ab3;p=emacs.git

* w32-fns.el (w32-check-shell-configuration): Doc fix.
  (w32-add-charset-info): Fix typo in docstring.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f37792e670..f3e6fe7c2a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-16  Juanma Barranquero  <lekktu@gmail.com>
+
+	* w32-fns.el (w32-check-shell-configuration): Doc fix.
+	(w32-add-charset-info): Fix typo in docstring.
+
 2008-10-16  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* international/mule-conf.el: Removed `utf8' and `UTF8' aliases
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 1c449d468f2..8a8ef7f1739 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -112,7 +112,7 @@ That includes all Windows systems except for 9X/Me."
 (defvar w32-quote-process-args)  ;; defined in w32proc.c
 
 (defun w32-check-shell-configuration ()
-  "Check the configuration of shell variables on Windows NT/9X.
+  "Check the configuration of shell variables on Windows.
 This function is invoked after loading the init files and processing
 the command line arguments.  It issues a warning if the user or site
 has configured the shell with inappropriate settings."
@@ -351,15 +351,14 @@ This function is provided for backward compatibility, since
   "Function to add character sets to display with Windows fonts.
 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
+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."
   (add-to-list 'w32-charset-info-alist
-               (cons xlfd-charset (cons windows-charset codepage)))
-  )
+               (cons xlfd-charset (cons windows-charset codepage))))
 
 ;; The last charset we add becomes the "preferred" charset for the return
 ;; value from w32-select-font etc, so list the most important charsets last.