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 /src/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 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2609ed7dd01..7a30c6e897a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | 1 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * buffer.c (syms_of_buffer): Doc fix. (Bug#19841) | ||
| 4 | |||
| 5 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | ||
| 6 | 2015-03-03 Eli Zaretskii <eliz@gnu.org> | ||
| 7 | |||
| 3 | * xfaces.c (map_tty_color): Use assoc_no_quit instead of | 8 | * xfaces.c (map_tty_color): Use assoc_no_quit instead of |
| 4 | assq_no_quit to fetch color definition by its string name. | 9 | assq_no_quit to fetch color definition by its string name. |
| 5 | (Bug#19802) | 10 | (Bug#19802) |