diff options
| author | Fabián Ezequiel Gallina | 2015-01-28 00:59:34 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2015-01-28 00:59:34 -0300 |
| commit | d7a89815b6d69c3b1793d34bcad8bf0aa21d48c8 (patch) | |
| tree | 6ac62b66bd5386355c96551da34416036cf279b7 /src/ChangeLog | |
| parent | 3a8b7013042adae3c27327a75662fd8e884d4896 (diff) | |
| parent | d279e6680842b872ae3aab1fb429b1879db50f7f (diff) | |
| download | emacs-d7a89815b6d69c3b1793d34bcad8bf0aa21d48c8.tar.gz emacs-d7a89815b6d69c3b1793d34bcad8bf0aa21d48c8.zip | |
Merge from origin/emacs-24
d279e66 Fix assertion violations in try_window_id (Bug#19511)
031eadc Fix dired quoting bug with "Hit`N`Hide"
5981b4b More doc fixes for bug#19502 -- make documentation less X-specific.
143516c src/emacs.c (syms_of_emacs) <system-configuration>: Doc fix. (Bug#19502)
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8e5166e22be..45946eb4a69 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2015-01-05 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (move_it_to, try_cursor_movement): Don't use the window | ||
| 4 | end information if the window_end_valid flag is unset. | ||
| 5 | (try_window_id): If the call to display_line invalidated the | ||
| 6 | window end information, give up the try_window_id optimization. | ||
| 7 | (Bug#19511) | ||
| 8 | |||
| 9 | 2015-01-04 Eli Zaretskii <eliz@gnu.org> | ||
| 10 | |||
| 11 | * w32fns.c (Fx_server_version, Fx_server_vendor): Doc fix. | ||
| 12 | |||
| 13 | * xfns.c (Fx_server_version, Fx_server_vendor): Doc fix. | ||
| 14 | |||
| 15 | * emacs.c (syms_of_emacs) <system-configuration>: Doc fix. | ||
| 16 | (Bug#19502) | ||
| 17 | |||
| 1 | 2015-01-27 Paul Eggert <eggert@cs.ucla.edu> | 18 | 2015-01-27 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 19 | ||
| 3 | Use bool for boolean in xfaces.c | 20 | Use bool for boolean in xfaces.c |