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 /nt | |
| 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 'nt')
| -rw-r--r-- | nt/README.W32 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nt/README.W32 b/nt/README.W32 index 644e0fe881a..1141e8a1b71 100644 --- a/nt/README.W32 +++ b/nt/README.W32 | |||
| @@ -105,7 +105,9 @@ See the end of the file for license conditions. | |||
| 105 | + runemacs.exe - A wrapper for running Emacs as a GUI application | 105 | + runemacs.exe - A wrapper for running Emacs as a GUI application |
| 106 | without popping up a command prompt window. If you create a | 106 | without popping up a command prompt window. If you create a |
| 107 | desktop shortcut for invoking Emacs, make it point to this | 107 | desktop shortcut for invoking Emacs, make it point to this |
| 108 | executable, not to emacs.exe. | 108 | executable, not to emacs.exe. If you pin Emacs to the task bar, |
| 109 | edit the properties of the pinned shortcut (with Shift-right mouse | ||
| 110 | click) to point to this executable. | ||
| 109 | 111 | ||
| 110 | + emacsclient.exe - A command-line client program that can | 112 | + emacsclient.exe - A command-line client program that can |
| 111 | communicate with a running Emacs process. See the `Emacs Server' | 113 | communicate with a running Emacs process. See the `Emacs Server' |