diff options
| author | Paul Eggert | 2015-03-03 14:35:41 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-03-03 14:35:41 -0800 |
| commit | 2c82deee7fbb951a90ed3246350fbf9390af038a (patch) | |
| tree | 465aaf0fdaefea778317ab1ed5c48400f223b596 /src/ChangeLog | |
| parent | 6eab3936c71951e304f13b69ad2e835ddaf9f2f4 (diff) | |
| parent | c0ba5908b117170995df36e839a087af7c5f79db (diff) | |
| download | emacs-2c82deee7fbb951a90ed3246350fbf9390af038a.tar.gz emacs-2c82deee7fbb951a90ed3246350fbf9390af038a.zip | |
Merge from origin/emacs-24
c0ba590 Fix vertical-motion and posn-at-point when word-wrap is
a323b93 Better multi-line input support in comint.el
008a04a todo-mode.el: Restore point on setting item done (Bug#19727)
9615c0d doc/misc/erc.texi: fix typo
c648717 Update ERC docs and update MAINTANERS to include myself
d825f66 Fix filling circle/ellipse in Artist Mode (Bug#19763)
Conflicts:
admin/ChangeLog
doc/misc/ChangeLog
doc/misc/erc.texi
lisp/ChangeLog
src/ChangeLog
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 0a05b544d98..5bfb1809139 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | 1 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (move_it_in_display_line_to): Handle the case where the | ||
| 4 | last character of a screen line is whitespace, and we are under | ||
| 5 | word-wrap with overflow-newline-into-fringe turned on. | ||
| 6 | (Bug#19769) | ||
| 7 | |||
| 8 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | ||
| 9 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | ||
| 10 | |||
| 3 | * xdisp.c (handle_stop, handle_single_display_spec) | 11 | * xdisp.c (handle_stop, handle_single_display_spec) |
| 4 | (next-element_from_image): Don't reset the | 12 | (next-element_from_image): Don't reset the |
| 5 | ignore_overlay_strings_at_pos_p flag here. | 13 | ignore_overlay_strings_at_pos_p flag here. |