diff options
| author | Paul Eggert | 2015-03-08 18:49:27 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-03-08 18:49:27 -0700 |
| commit | 59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d (patch) | |
| tree | 14f76279dfbe805aefb1f11b8b23ea6d9aa192f0 /lisp | |
| parent | 0dfe7002a6b6f330b981e2d40f372bf71eeac1df (diff) | |
| parent | 113fcc3b739d6a024e41a5727aeddca7aaf1cb81 (diff) | |
| download | emacs-59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d.tar.gz emacs-59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d.zip | |
Merge from origin/emacs-24
113fcc3 * etc/AUTHORS: Update the AUTHORS file
51c0c8d * lisp/ChangeLog: Fix a changelog entry
Conflicts:
etc/AUTHORS
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd7dcd31ffd..121a395e63d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -241,8 +241,8 @@ | |||
| 241 | 2015-03-03 Agustín Martín Domingo <agustin6martin@gmail.com> | 241 | 2015-03-03 Agustín Martín Domingo <agustin6martin@gmail.com> |
| 242 | 242 | ||
| 243 | Improve string search in `flyspell-word-search-*`. (Bug#16800) | 243 | Improve string search in `flyspell-word-search-*`. (Bug#16800) |
| 244 | * flyspell.el (flyspell-duplicate-distance): Limit default search | 244 | * textmodes/flyspell.el (flyspell-duplicate-distance): Limit |
| 245 | distance for duplicated words to 40000. | 245 | default search distance for duplicated words to 40000. |
| 246 | (flyspell-word-search-backward, flyspell-word-search-forward): | 246 | (flyspell-word-search-backward, flyspell-word-search-forward): |
| 247 | Search as full word with defined casechars, not as substring. | 247 | Search as full word with defined casechars, not as substring. |
| 248 | 248 | ||