diff options
| author | Fabián Ezequiel Gallina | 2015-01-28 01:03:44 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2015-01-28 01:03:44 -0300 |
| commit | b0edd7c69d88f245981a05e2333b09e3171d4e6f (patch) | |
| tree | b097d4b6572f7300acdcb9461e72009b2d7bdebf /src/ChangeLog | |
| parent | f4fcb10303e21d4a0526e070f7951b789c781b9f (diff) | |
| parent | b544ab561fcb575790c963a2eda51524fa366409 (diff) | |
| download | emacs-b0edd7c69d88f245981a05e2333b09e3171d4e6f.tar.gz emacs-b0edd7c69d88f245981a05e2333b09e3171d4e6f.zip | |
Merge from origin/emacs-24
b544ab5 Fix return value of vertical-motion at ZV (Bug#19553)
1f179ea Fix encoding of I/O in net-utils.el for MS-Windows. (Bug#19458)
70f298f Fix the description of -nl in --help text. (Bug#19542)
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 45946eb4a69..422933d22f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2015-01-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * indent.c (Fvertical_motion): Return zero if we started from ZV | ||
| 4 | and there's an overlay after-string there. (Bug#19553) | ||
| 5 | |||
| 6 | 2015-01-09 Eli Zaretskii <eliz@gnu.org> | ||
| 7 | |||
| 8 | * emacs.c (usage_message): Fix the description of the -nl switch. | ||
| 9 | (Bug#19542) | ||
| 10 | |||
| 1 | 2015-01-05 Eli Zaretskii <eliz@gnu.org> | 11 | 2015-01-05 Eli Zaretskii <eliz@gnu.org> |
| 2 | 12 | ||
| 3 | * xdisp.c (move_it_to, try_cursor_movement): Don't use the window | 13 | * xdisp.c (move_it_to, try_cursor_movement): Don't use the window |