diff options
| author | Rasmus | 2017-09-29 10:41:51 +0200 |
|---|---|---|
| committer | Rasmus | 2017-09-29 10:41:51 +0200 |
| commit | d4b2bbdc73ace5cb0971a32a75941486489d1cc5 (patch) | |
| tree | dc92eb83d4a66f112e3688ad10632e14ca6601ff /ChangeLog.2 | |
| parent | eaefbc26d5c6cffbe4a22d3a9f4c7e6209a7b5a7 (diff) | |
| parent | af130f900fc499f71ea22f10ba055a75ce35ed4e (diff) | |
| download | emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.gz emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.zip | |
Merge branch 'emacs-26' into scratch/org-mode-merge
Diffstat (limited to 'ChangeLog.2')
| -rw-r--r-- | ChangeLog.2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index bd1800b3307..e789722a4d6 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 | |||
| @@ -4808,7 +4808,7 @@ | |||
| 4808 | Link from (emacs)Exiting to (lisp)Killing Emacs | 4808 | Link from (emacs)Exiting to (lisp)Killing Emacs |
| 4809 | 4809 | ||
| 4810 | * doc/emacs/entering.texi (Exiting): Link to the lispref | 4810 | * doc/emacs/entering.texi (Exiting): Link to the lispref |
| 4811 | manual for further customisations (bug#15445). | 4811 | manual for further customizations (bug#15445). |
| 4812 | 4812 | ||
| 4813 | (cherry picked from commit bc5f27aa099cdde02ca66e71501b89300685ab28) | 4813 | (cherry picked from commit bc5f27aa099cdde02ca66e71501b89300685ab28) |
| 4814 | 4814 | ||
| @@ -7845,7 +7845,7 @@ | |||
| 7845 | 7845 | ||
| 7846 | 2016-02-20 Lars Ingebrigtsen <larsi@gnus.org> | 7846 | 2016-02-20 Lars Ingebrigtsen <larsi@gnus.org> |
| 7847 | 7847 | ||
| 7848 | Allow customising the article mode cursor behavior | 7848 | Allow customizing the article mode cursor behavior |
| 7849 | 7849 | ||
| 7850 | * doc/misc/gnus.texi (HTML): Mention gnus-article-show-cursor. | 7850 | * doc/misc/gnus.texi (HTML): Mention gnus-article-show-cursor. |
| 7851 | 7851 | ||