aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-11-30 02:58:31 +0000
committerJuanma Barranquero2008-11-30 02:58:31 +0000
commit35f36d65e77033960cb72b68637107ac70e31127 (patch)
treea1a56b1dc21e84b5adb4be62ca65eec63876f56a
parent59ef77e79f7f3a19322faec442c0b2bed6af8fd6 (diff)
downloademacs-35f36d65e77033960cb72b68637107ac70e31127.tar.gz
emacs-35f36d65e77033960cb72b68637107ac70e31127.zip
* w32proc.c (Fw32_get_locale_info): Fix typo in docstring.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32proc.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 143d8730bab..9fa128596bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-11-30 Juanma Barranquero <lekktu@gmail.com>
2
3 * w32proc.c (Fw32_get_locale_info): Fix typo in docstring.
4
12008-11-29 Juanma Barranquero <lekktu@gmail.com> 52008-11-29 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * w32proc.c: Include "coding.h". 7 * w32proc.c: Include "coding.h".
diff --git a/src/w32proc.c b/src/w32proc.c
index 081749257f5..867ceb60f37 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -703,7 +703,7 @@ w32_executable_type (char * filename, int * is_dos_app, int * is_cygnus_app, int
703 { 703 {
704 char * dllname = RVA_TO_PTR (imports->Name, section, 704 char * dllname = RVA_TO_PTR (imports->Name, section,
705 executable); 705 executable);
706 706
707 /* The exact name of the cygwin dll has changed with 707 /* The exact name of the cygwin dll has changed with
708 various releases, but hopefully this will be reasonably 708 various releases, but hopefully this will be reasonably
709 future proof. */ 709 future proof. */
@@ -1946,7 +1946,7 @@ DEFUN ("w32-get-locale-info", Fw32_get_locale_info,
1946 Sw32_get_locale_info, 1, 2, 0, 1946 Sw32_get_locale_info, 1, 2, 0,
1947 doc: /* Return information about the Windows locale LCID. 1947 doc: /* Return information about the Windows locale LCID.
1948By default, return a three letter locale code which encodes the default 1948By default, return a three letter locale code which encodes the default
1949language as the first two characters, and the country or regionial variant 1949language as the first two characters, and the country or regional variant
1950as the third letter. For example, ENU refers to `English (United States)', 1950as the third letter. For example, ENU refers to `English (United States)',
1951while ENC means `English (Canadian)'. 1951while ENC means `English (Canadian)'.
1952 1952