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 /doc/misc/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 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 4e9c119379d..c00cb2f722a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2015-03-03 Kelvin White <kwhite@gnu.org> | ||
| 2 | |||
| 3 | * erc.texi (Advanced Usage, Options): Add descriptions and examples | ||
| 4 | for erc-format-nick-function and erc-rename-buffers options. | ||
| 5 | (Connecting): fix typo | ||
| 6 | |||
| 7 | 2015-03-03 Michael Albinus <michael.albinus@gmx.de> | ||
| 1 | 2015-03-02 Daniel Colascione <dancol@dancol.org> | 8 | 2015-03-02 Daniel Colascione <dancol@dancol.org> |
| 2 | 9 | ||
| 3 | * cl.texi (Iteration Clauses): Mention iterator support. | 10 | * cl.texi (Iteration Clauses): Mention iterator support. |