diff options
| author | Paul Eggert | 2017-03-19 12:34:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-03-19 12:34:03 -0700 |
| commit | 90f5282e20df79dedaa9d231a108f9a91222eca7 (patch) | |
| tree | 4b2f648d7209c93fc845c68beccd27b98a51fdac /etc | |
| parent | c4fca5cee27e3bf399ad23bf42317bffcc80f160 (diff) | |
| parent | ec4226d81074751c105264a3a3383c48d0a05e41 (diff) | |
| download | emacs-90f5282e20df79dedaa9d231a108f9a91222eca7.tar.gz emacs-90f5282e20df79dedaa9d231a108f9a91222eca7.zip | |
Merge from origin/emacs-25
ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description.
2b774fa Mention "editor" in Emacs man page header
ae60d0c Document problems with nerd-fonts
2fdb5a9 ; Details about pinning Emacs to w32 task bar
5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i...
4c51ef4 Clarify what is the "cursor"
8303c32 ; * etc/NEWS: Copyedits.
3f7493e ; Fix a typo in comment
c54cf8d Improve commentary in lisp.h
8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro...
0ba9932 Disable native completion for ipython (Bug#25067)
38fc456 Fix a typo in ada-mode manual
00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d...
a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-...
# Conflicts:
# etc/NEWS
# etc/PROBLEMS
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | etc/PROBLEMS | 4 |
2 files changed, 5 insertions, 2 deletions
| @@ -21,12 +21,11 @@ Temporary note: | |||
| 21 | --- means no change in the manuals is needed. | 21 | --- means no change in the manuals is needed. |
| 22 | When you add a new item, use the appropriate mark if you are sure it applies, | 22 | When you add a new item, use the appropriate mark if you are sure it applies, |
| 23 | 23 | ||
| 24 | +++ | ||
| 25 | ** The version number of CC Mode has been changed from 5.33 to | 24 | ** The version number of CC Mode has been changed from 5.33 to |
| 26 | 5.32.99, although the software itself hasn't changed. This aims to | 25 | 5.32.99, although the software itself hasn't changed. This aims to |
| 27 | reduce confusion with the standalone CC Mode 5.33 (available from | 26 | reduce confusion with the standalone CC Mode 5.33 (available from |
| 28 | http://cc-mode.sourceforge.net), which is a more mature version than | 27 | http://cc-mode.sourceforge.net), which is a more mature version than |
| 29 | the one in Emacs 25.2. | 28 | the one included in Emacs 25.2. |
| 30 | 29 | ||
| 31 | 30 | ||
| 32 | * Installation Changes in Emacs 26.1 | 31 | * Installation Changes in Emacs 26.1 |
diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 15d2b74cc40..cf92db67afc 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS | |||
| @@ -745,6 +745,10 @@ The solution is to install the appropriate fonts on your machine. For | |||
| 745 | instance if you are editing a text with a lot of math symbols, then | 745 | instance if you are editing a text with a lot of math symbols, then |
| 746 | installing a font like 'Symbola' should solve this problem. | 746 | installing a font like 'Symbola' should solve this problem. |
| 747 | 747 | ||
| 748 | Another reason for slow display is reportedly the nerd-fonts | ||
| 749 | installation, even when Symbola is installed as well. Uninstalling | ||
| 750 | nerd-fonts was reported to solve the problem in that case. | ||
| 751 | |||
| 748 | ** Emacs running on GNU/Linux system with the m17n library Ver.1.7.1 or the | 752 | ** Emacs running on GNU/Linux system with the m17n library Ver.1.7.1 or the |
| 749 | earlier version has a problem with rendering Bengali script. | 753 | earlier version has a problem with rendering Bengali script. |
| 750 | 754 | ||