diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:38:53 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:38:53 -0800 |
| commit | 923602fefbfadd47e0b675d97aa1b28a16971da0 (patch) | |
| tree | 8f2c148120694da902f3947e8bd097c0d0f469a8 /lisp/emacs-lisp | |
| parent | 1fb87f1f1aa0947ec7b572a0ec1677c18aefc9f0 (diff) | |
| parent | 0077b36e2ed14e484c1f736496db9314ef7ca177 (diff) | |
| download | emacs-923602fefbfadd47e0b675d97aa1b28a16971da0.tar.gz emacs-923602fefbfadd47e0b675d97aa1b28a16971da0.tar.bz2 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/emacs-lisp')
0 files changed, 0 insertions, 0 deletions