Merge from origin/emacs-24

[gnu-emacs] / src / w32proc.c

diff --git a/src/w32proc.c b/src/w32proc.c
index c571726d70f21676629e94b3f4f3200d70b3e2ce..297db0e01852a7342a215fa05120f6ad56cee2b8 100644 (file)
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -3070,7 +3070,12 @@ If successful, the new CP is returned, otherwise nil.  */)
 DEFUN ("w32-get-codepage-charset", Fw32_get_codepage_charset,
        Sw32_get_codepage_charset, 1, 1, 0,
        doc: /* Return charset ID corresponding to codepage CP.
-Returns nil if the codepage is not valid.  */)
+Returns nil if the codepage is not valid or its charset ID could
+not be determined.
+
+Note that this function is only guaranteed to work with ANSI
+codepages; most console codepages are not supported and will
+yield nil.  */)
   (Lisp_Object cp)
 {
   CHARSETINFO info;