diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-04 17:16:39 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-04 17:16:39 -0800 |
commit | bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8 (patch) | |
tree | f5611596b3c70cdd536adfc06e9880bdd1bfc211 /ChangeLog.2 | |
parent | 78589529a7e7ea21f78c972c87b9e2c94ef27610 (diff) | |
parent | f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2 (diff) |
Merge from origin/emacs-26
f2caf08ca6 ; Spelling fixes
f0e5f220b6 * lisp/progmodes/grep.el (zrgrep):
a0f71260f8 Minor copyedits in doc/emacs/text.texi
adfe2f580f Remove outdated comment in syntax.el
b80e15b6a6 Prevent Flyspell from changing unrelated words
e385599457 Avoid errors in flymake in builds --without-x
d691e30cb0 More improvements of the Emacs manual
Diffstat (limited to 'ChangeLog.2')
-rw-r--r-- | ChangeLog.2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index b17cc3c04b8..71c792e40bc 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -9949,7 +9949,7 @@ * lisp/files-x.el (modify-dir-local-variable): Small rewrite Change a variable name to be more meaningful, and reorder some of - the code with no change in behaviour. + the code with no change in behavior. 2016-01-26 Artur Malabarba <bruce.connor.am@gmail.com> |