diff options
| author | Xue Fuqiao | 2013-12-26 06:27:00 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-12-26 06:27:00 +0800 |
| commit | 77bbf3713d459c45492e6daed68437edcf863a0c (patch) | |
| tree | 0e2ea82f80e907cea52eb683a362504a3813a463 /src/ChangeLog | |
| parent | 3bc1e1880f232ccaea7c35a0c51bac61df9ac23c (diff) | |
| parent | 83fa295c1236aba5a73d565082dcb58a32f3e446 (diff) | |
| download | emacs-77bbf3713d459c45492e6daed68437edcf863a0c.tar.gz emacs-77bbf3713d459c45492e6daed68437edcf863a0c.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 818ff2784be..1e8684c4ddb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,22 @@ | |||
| 1 | 2013-12-25 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32fns.c (Fw32_shell_execute): Make DOCUMENT absolute only if it | ||
| 4 | is a file name. (Bug#16252) | ||
| 5 | |||
| 6 | 2013-12-25 Chong Yidong <cyd@gnu.org> | ||
| 7 | |||
| 8 | * keyboard.c (Voverriding_terminal_local_map): | ||
| 9 | (Voverriding_local_map): Doc fix. | ||
| 10 | |||
| 11 | * keymap.c (Vemulation_mode_map_alists): Doc fix. | ||
| 12 | |||
| 13 | 2013-12-24 Eli Zaretskii <eliz@gnu.org> | ||
| 14 | |||
| 15 | * w32fns.c (Fw32_shell_execute): Ensure DOCUMENT is an absolute | ||
| 16 | file name when it is submitted to ShellExecute. Simplify code. | ||
| 17 | Don't test DOCUMENT for being a string, as that is enforced by | ||
| 18 | CHECK_STRING. Doc fix. | ||
| 19 | |||
| 1 | 2013-12-23 Eli Zaretskii <eliz@gnu.org> | 20 | 2013-12-23 Eli Zaretskii <eliz@gnu.org> |
| 2 | 21 | ||
| 3 | * xdisp.c (tool_bar_height): Use WINDOW_PIXEL_WIDTH to set up the | 22 | * xdisp.c (tool_bar_height): Use WINDOW_PIXEL_WIDTH to set up the |