diff options
| author | Paul Eggert | 2015-03-03 14:38:53 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-03-03 14:38:53 -0800 |
| commit | 923602fefbfadd47e0b675d97aa1b28a16971da0 (patch) | |
| tree | 8f2c148120694da902f3947e8bd097c0d0f469a8 /lisp/erc/ChangeLog | |
| parent | 1fb87f1f1aa0947ec7b572a0ec1677c18aefc9f0 (diff) | |
| parent | 0077b36e2ed14e484c1f736496db9314ef7ca177 (diff) | |
| download | emacs-923602fefbfadd47e0b675d97aa1b28a16971da0.tar.gz emacs-923602fefbfadd47e0b675d97aa1b28a16971da0.zip | |
Merge from origin/emacs-24
0077b36 # NEWS copyedits
3ca2ff3 * lisp/erc/erc.el (erc-rename-buffers): Doc fix. Add :version.
b85523f * lisp/textmodes/flyspell.el (flyspell-duplicate-distance):
decb48d Augment text-mode syntax table for a few special characters
8b3ba7a Improve docs of transient-mark-mode (Bug#19841)
72fd047 NEWS: Add section to include ERC changes
a7254bb Improve string search in `flyspell-word-search-*`. (Bug#16800)
Conflicts:
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/erc/ChangeLog
src/ChangeLog
Diffstat (limited to 'lisp/erc/ChangeLog')
| -rw-r--r-- | lisp/erc/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 4c1c8432733..f89d5a2d043 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2015-03-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * erc.el (erc-rename-buffers): Doc fix. Add :version. | ||
| 4 | |||
| 5 | 2015-03-03 Dima Kogan <dima@secretsauce.net> | ||
| 6 | |||
| 7 | * erc-backend.el (define-erc-response-handler): Give hook-name | ||
| 8 | default value of nil and add-to-list (bug#19363). | ||
| 1 | 2015-02-14 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2015-02-14 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 10 | ||
| 3 | * erc-spelling.el (erc-spelling-init): | 11 | * erc-spelling.el (erc-spelling-init): |