diff options
| author | Eli Zaretskii | 2010-05-11 20:23:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-05-11 20:23:52 +0300 |
| commit | c8670ded9c8c4fe3801b6a378ee93f9180ce0453 (patch) | |
| tree | 37dc29acb52543a4ce23c305b1ecf7456e758f75 /src/ChangeLog | |
| parent | 3ffd461547221ea713427fa3e547b422cdc77f1c (diff) | |
| download | emacs-c8670ded9c8c4fe3801b6a378ee93f9180ce0453.tar.gz emacs-c8670ded9c8c4fe3801b6a378ee93f9180ce0453.zip | |
Backport from trunk: Fix bug #6126.
makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(SRC)/w32.h.
w32fns.c: Include w32.h.
(Fw32_shell_execute): Decode the error message before passing it
to `error'.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4e0c7e6df71..8e2774f2a03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2010-05-11 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(SRC)/w32.h. | ||
| 4 | |||
| 5 | * w32fns.c: Include w32.h. | ||
| 6 | (Fw32_shell_execute): Decode the error message before passing it | ||
| 7 | to `error'. (Bug#6126) | ||
| 8 | |||
| 1 | 2010-05-11 Karel Klic <kklic@redhat.com> | 9 | 2010-05-11 Karel Klic <kklic@redhat.com> |
| 2 | 10 | ||
| 3 | * ftfont.c: Fix incorrect parentheses of #if condition for | 11 | * ftfont.c: Fix incorrect parentheses of #if condition for |