diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:52:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:52:04 -0800 |
| commit | 98284ef51c67fa69796946466337d426ab81f9ee (patch) | |
| tree | e43f8d3ab77f67a2fca1dd016037693674b91c26 /doc | |
| parent | 518eab2f7db71929e4877daa5ebd06b1416e69e6 (diff) | |
| parent | c4ade119ccd1904795b2e8d76cd93aedc86d1b09 (diff) | |
| download | emacs-98284ef51c67fa69796946466337d426ab81f9ee.tar.gz | |
Merge from origin/emacs-24
c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 1 | ||||
| -rw-r--r-- | doc/misc/ChangeLog | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 50cc9cb43b3..42bff7c865a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -3,7 +3,6 @@ * processes.texi (Synchronous Processes): Update documentation of call-process-shell-command and process-file-shell-command. -2015-03-03 Eli Zaretskii <eliz@gnu.org> 2015-03-03 Daniel Colascione <dancol@dancol.org> * control.texi (Generators): Correct missing word. Clarify which diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c00cb2f722a..c721b250112 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -4,7 +4,6 @@ for erc-format-nick-function and erc-rename-buffers options. (Connecting): fix typo -2015-03-03 Michael Albinus <michael.albinus@gmx.de> 2015-03-02 Daniel Colascione <dancol@dancol.org> * cl.texi (Iteration Clauses): Mention iterator support. |