diff options
| author | Glenn Morris | 2014-01-22 14:26:45 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-01-22 14:26:45 -0500 |
| commit | e2a095b16ffb909bf835516098bac8ae6f075992 (patch) | |
| tree | ad8d3e60f137a8f699d6b32483027b6a8880b552 | |
| parent | 29afcbab15aa77b04cb99d0977a85df22df4feac (diff) | |
| download | emacs-e2a095b16ffb909bf835516098bac8ae6f075992.tar.gz emacs-e2a095b16ffb909bf835516098bac8ae6f075992.zip | |
ChangeLog fix.
* lisp/ChangeLog: The installed change was based on this one:
http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00372.html
* etc/NEWS: Fix based on the fact that this does not work out of the box,
unless you fetch the notes, as described in
http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00015.html
Seems very non-intuitive to me...
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 |
2 files changed, 6 insertions, 2 deletions
| @@ -236,7 +236,8 @@ simply disabling Transient Mark mode does the same thing. | |||
| 236 | and this variable has been marked obsolete. | 236 | and this variable has been marked obsolete. |
| 237 | 237 | ||
| 238 | --- | 238 | --- |
| 239 | ** `emacs-bzr-version' has been renamed to `emacs-repository-version'. | 239 | ** `emacs-bzr-version' has been renamed to `emacs-repository-version', |
| 240 | and works for git too, if you fetch the repository notes. | ||
| 240 | 241 | ||
| 241 | ** New user options: | 242 | ** New user options: |
| 242 | 243 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc93d5c3cfe..99b65d735eb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -336,11 +336,14 @@ | |||
| 336 | * simple.el (read--expression): Enable eldoc-mode. | 336 | * simple.el (read--expression): Enable eldoc-mode. |
| 337 | * progmodes/octave.el (octave-mode-menu): Adapt to change in eldoc. | 337 | * progmodes/octave.el (octave-mode-menu): Adapt to change in eldoc. |
| 338 | 338 | ||
| 339 | 2014-01-11 Eric S. Raymond <esr@thyrsus.com> | 339 | 2014-01-11 Dani Moncayo <dmoncayo@gmail.com> |
| 340 | Eric S. Raymond <esr@thyrsus.com> | ||
| 340 | 341 | ||
| 341 | * version.el (emacs-repository-get-version): Enhance so the | 342 | * version.el (emacs-repository-get-version): Enhance so the |
| 342 | function works correctly in either a Bazaar or Git repo. | 343 | function works correctly in either a Bazaar or Git repo. |
| 343 | 344 | ||
| 345 | 2014-01-11 Eric S. Raymond <esr@thyrsus.com> | ||
| 346 | |||
| 344 | * play/meese.el: It's 2014 and Ed Meese is justly forgotten. | 347 | * play/meese.el: It's 2014 and Ed Meese is justly forgotten. |
| 345 | Goes with removal of the joke manpages from /etc. | 348 | Goes with removal of the joke manpages from /etc. |
| 346 | 349 | ||