diff options
| author | Juanma Barranquero | 2010-09-26 03:39:24 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-09-26 03:39:24 +0200 |
| commit | 83e245c4906513429cb56629485deb5f04a240a3 (patch) | |
| tree | 97edb0194ce94efdc6ec21f75a75cc706ef8c828 /src | |
| parent | 4234374700a24ff0e5b94bbdb2481ba623c51a32 (diff) | |
| download | emacs-83e245c4906513429cb56629485deb5f04a240a3.tar.gz emacs-83e245c4906513429cb56629485deb5f04a240a3.zip | |
src/w32.c (get_emacs_configuration_options): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 29071a36b0e..d43853e7baa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-09-26 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * w32.c (get_emacs_configuration_options): Fix previous change. | ||
| 4 | |||
| 1 | 2010-09-25 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-09-25 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * insdel.c (prepare_to_modify_buffer): Ensure the mark marker is | 7 | * insdel.c (prepare_to_modify_buffer): Ensure the mark marker is |
| @@ -1956,8 +1956,9 @@ get_emacs_configuration_options (void) | |||
| 1956 | #endif | 1956 | #endif |
| 1957 | #endif | 1957 | #endif |
| 1958 | 1958 | ||
| 1959 | if (_snprintf (cv, sizeof (cv), COMPILER_VERSION) < 0) | 1959 | if (_snprintf (cv, sizeof (cv) - 1, COMPILER_VERSION) < 0) |
| 1960 | return "Error: not enough space for compiler version"; | 1960 | return "Error: not enough space for compiler version"; |
| 1961 | cv[sizeof (cv) - 1] = '\0'; | ||
| 1961 | 1962 | ||
| 1962 | for (i = 0; options[i]; i++) | 1963 | for (i = 0; options[i]; i++) |
| 1963 | size += strlen (options[i]); | 1964 | size += strlen (options[i]); |