diff options
| author | Glenn Morris | 2014-11-29 13:25:50 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-29 13:25:50 -0800 |
| commit | aa1459ae2a2d578455a3da911732fceaeeb5d23e (patch) | |
| tree | e7e4ac0188fce4bcdb357937f074e43bc23614cf /lisp/ChangeLog | |
| parent | 287740d6ed8135702d34133dbf01c4387bc145dc (diff) | |
| download | emacs-aa1459ae2a2d578455a3da911732fceaeeb5d23e.tar.gz emacs-aa1459ae2a2d578455a3da911732fceaeeb5d23e.zip | |
Fix up merged ChangeLog entries (dates, duplication, etc)
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fbd7e2f8eeb..f1ef3f2a232 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -9,12 +9,6 @@ | |||
| 9 | forward to find the end of the subtree and the insertion point | 9 | forward to find the end of the subtree and the insertion point |
| 10 | (bug#19102). | 10 | (bug#19102). |
| 11 | 11 | ||
| 12 | 2014-11-29 Leonard Randall <leonard.a.randall@gmail.com> | ||
| 13 | |||
| 14 | * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search | ||
| 15 | for comment lines non-greedy and stopping at newlines to fix stack | ||
| 16 | overflows with large files. [Backport] | ||
| 17 | |||
| 18 | 2014-11-29 Fabián Ezequiel Gallina <fgallina@gnu.org> | 12 | 2014-11-29 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 19 | 13 | ||
| 20 | * progmodes/python.el (python-shell-completion-setup-code): Use | 14 | * progmodes/python.el (python-shell-completion-setup-code): Use |
| @@ -171,19 +165,19 @@ | |||
| 171 | 165 | ||
| 172 | * dom.el (dom-pp): New function. | 166 | * dom.el (dom-pp): New function. |
| 173 | 167 | ||
| 174 | 2014-11-17 Eli Zaretskii <eliz@gnu.org> | 168 | 2014-11-27 Eli Zaretskii <eliz@gnu.org> |
| 175 | 169 | ||
| 176 | * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry): | 170 | * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry): |
| 177 | Don't assume --long is the default for "bzr log", always specify | 171 | Don't assume --long is the default for "bzr log", always specify |
| 178 | it explicitly, in case the user defined an alias for 'log' that | 172 | it explicitly, in case the user defined an alias for 'log' that |
| 179 | uses some other format. | 173 | uses some other format. |
| 180 | 174 | ||
| 181 | 2014-11-16 Fabián Ezequiel Gallina <fgallina@gnu.org> | 175 | 2014-11-27 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 182 | 176 | ||
| 183 | * progmodes/python.el (python-eldoc--get-doc-at-point): | 177 | * progmodes/python.el (python-eldoc--get-doc-at-point): |
| 184 | Strip shell output before returning. (bug#18794) | 178 | Strip shell output before returning. (bug#18794) |
| 185 | 179 | ||
| 186 | 2014-11-16 Dmitry Gutov <dgutov@yandex.ru> | 180 | 2014-11-27 Dmitry Gutov <dgutov@yandex.ru> |
| 187 | 181 | ||
| 188 | Fix indentation before `!=' and after `+='. Originally reported | 182 | Fix indentation before `!=' and after `+='. Originally reported |
| 189 | in https://github.com/mooz/js2-mode/issues/174. | 183 | in https://github.com/mooz/js2-mode/issues/174. |
| @@ -191,7 +185,7 @@ | |||
| 191 | (in)equality operator a separate case. | 185 | (in)equality operator a separate case. |
| 192 | (js--continued-expression-p): Escape the second `+' in the regexp. | 186 | (js--continued-expression-p): Escape the second `+' in the regexp. |
| 193 | 187 | ||
| 194 | 2014-11-16 Stefan Monnier <monnier@iro.umontreal.ca> | 188 | 2014-11-27 Stefan Monnier <monnier@iro.umontreal.ca> |
| 195 | 189 | ||
| 196 | * window.el (handle-select-window): Deactivate shift-region (bug#19003). | 190 | * window.el (handle-select-window): Deactivate shift-region (bug#19003). |
| 197 | 191 | ||