diff options
| author | Paul Eggert | 2017-11-08 19:22:26 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-11-08 19:22:26 -0800 |
| commit | 6ee827059463e4b95c9251ef22a21f9c67cf668d (patch) | |
| tree | 0612e1b84922cc43eeed5ea219104d4c5985cbdf /nt | |
| parent | 83dc3f0e9b518e45bcfb0aaebcc706f79622f157 (diff) | |
| parent | 255ba01148f69f452937e67feb7af5d4c1466fed (diff) | |
| download | emacs-6ee827059463e4b95c9251ef22a21f9c67cf668d.tar.gz emacs-6ee827059463e4b95c9251ef22a21f9c67cf668d.zip | |
Merge from origin/emacs-26
255ba01148 Fix handling of nil PRED2 arg for completion-table-with-pr...
949b70a7d8 ; Minor comment copyedit in window.c
20f9bf30f0 Describe Lao rendering problem
3d61657694 Fix docstring of arabic-shaper-ZWNJ-handling
db949166ec Handle single-line comments correctly (Bug#26049)
795bb233a5 * test/lisp/net/tramp-tests.el (tramp-test16-file-expand-w...
ba00ea7d0d * etc/PROBLEMS: Add URL to relevant issues for xterm+evil bug
4a6015811e ; In text.texi fix typo spotted by Štěpán Němec
93cd8415b2 Document new treatment of 'comment-auto-fill-only-comments'
ca2d94ba61 Do not load Tramp unless `tramp-mode' is non-nil
709478eaa8 Prefer `customize-set-variable' in tramp.texi
5d36f2227f Fix last change in hscroll_window_tree
72d07d1950 Ediff: add some missing documentation
18af404ef3 Support python virtualenv on w32 (Bug#24464)
efd0371c23 Improve dired deletion error handling (Bug#28797)
5d744e032f Don't replace user input when completion prefix is empty (...
ec6cf35c5f ; Describe xt-mouse problems with Evil mode
c572e1f329 Return non-nil from gnutls-available-p under GnuTLS 2.x
a2cc6d74c5 Fix Flymake help-echo functions across windows (bug#29142)
58bb3462ee Add tests for Flymake backends for Ruby and Perl
58e742b21d Add a Flymake backend for Perl
9dee764165 Add a Flymake backend for Ruby
3ad712ebc9 Add a Flymake backend for Python (bug#28808)
8db2b3a79b Allow "%" in Tramp host names
8c50842790 ; Fix typo in test/file-organization.org
00fa4449cd ; Fix typo
918a2dda07 Use hybrid malloc for FreeBSD (Bug#28308)
725ab635d9 Add html-, mhtml- and python-mode support to semantic symref
369da28702 Improve documentation of 'window-scroll-functions'
93818eed8a Fix subtle problems in tabulated-list-mode with line numbers
1f1de8e872 Make gdb-non-stop-setting default to nil on MS-Windows
680e8e119b Fix gdb-mi prompt after "attach PID" command
ff33074546 Fix doc string of 'window-configuration-change-hook'
787b75ad71 Improve documentation of window hooks
d9be8704ae Fix hscroll suspension after cursor motion
6f43d29d29 ; * CONTRIBUTE, admin/make-tarball.txt: Doc tweaks re 'ema...
a0d30d6369 Introduce a function to CC Mode which displays the current...
383abc8898 ; Fix some comment typos
b02c2714c3 Fix typos in ediff-wind.el
4f38bdec74 Examine tex-chktex--process in the correct buffer
94b490529a * nt/INSTALL.W64: Update to current mingw64 install instru...
c25113d4ac Don't resignal errors in flymake-diag-region
e950f329c0 New xref-quit-and-goto-xref command bound to TAB (bug#28814)
5d34e1b288 Allow split-window-sensibly to split threshold in further ...
2a973edeac Honor window-switching intents in xref-find-definitions (b...
78e9065e9f * lisp/emacs-lisp/generator.el (iter-do): Add a debug decl...
caa63cc96c * lisp/progmodes/flymake.el (flymake-start): Fix dead buff...
9f4f130b79 Fix buffer name comparison in async shell-command
# Conflicts:
# etc/NEWS
# lisp/vc/ediff-wind.el
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/INSTALL.W64 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64 index 4a93dc02c8b..392ecf2b3a4 100644 --- a/nt/INSTALL.W64 +++ b/nt/INSTALL.W64 | |||
| @@ -49,13 +49,13 @@ will also be available at the Windows console. | |||
| 49 | 49 | ||
| 50 | ** Download and install the necessary packages | 50 | ** Download and install the necessary packages |
| 51 | 51 | ||
| 52 | Run msys2_shell.bat in your MSYS2 directory and you will see a BASH window | 52 | Run c:/msys64/msys2.exe in your MSYS2 directory and you will see a BASH window |
| 53 | opened. | 53 | opened. |
| 54 | 54 | ||
| 55 | In the BASH prompt, use the following command to install the necessary | 55 | In the BASH prompt, use the following command to install the necessary |
| 56 | packages (you can copy and paste it into the shell with Shift + Insert): | 56 | packages (you can copy and paste it into the shell with Shift + Insert): |
| 57 | 57 | ||
| 58 | pacman -S base-devel \ | 58 | pacman -S --needed base-devel \ |
| 59 | mingw-w64-x86_64-toolchain \ | 59 | mingw-w64-x86_64-toolchain \ |
| 60 | mingw-w64-x86_64-xpm-nox \ | 60 | mingw-w64-x86_64-xpm-nox \ |
| 61 | mingw-w64-x86_64-libtiff \ | 61 | mingw-w64-x86_64-libtiff \ |
| @@ -63,7 +63,7 @@ packages (you can copy and paste it into the shell with Shift + Insert): | |||
| 63 | mingw-w64-x86_64-libpng \ | 63 | mingw-w64-x86_64-libpng \ |
| 64 | mingw-w64-x86_64-libjpeg-turbo \ | 64 | mingw-w64-x86_64-libjpeg-turbo \ |
| 65 | mingw-w64-x86_64-librsvg \ | 65 | mingw-w64-x86_64-librsvg \ |
| 66 | mingw-w64-x86_64-liblcms2 \ | 66 | mingw-w64-x86_64-lcms2 \ |
| 67 | mingw-w64-x86_64-libxml2 \ | 67 | mingw-w64-x86_64-libxml2 \ |
| 68 | mingw-w64-x86_64-gnutls \ | 68 | mingw-w64-x86_64-gnutls \ |
| 69 | mingw-w64-x86_64-zlib | 69 | mingw-w64-x86_64-zlib |
| @@ -126,7 +126,7 @@ Now you're ready to build and install Emacs with autogen, configure, make, | |||
| 126 | and make install. | 126 | and make install. |
| 127 | 127 | ||
| 128 | First we need to switch to the MinGW-w64 environment. Exit the MSYS2 BASH | 128 | First we need to switch to the MinGW-w64 environment. Exit the MSYS2 BASH |
| 129 | console and run mingw64_shell.bat in the C:\msys64 folder, then cd back to | 129 | console and run mingw64.exe in the C:\msys64 folder, then cd back to |
| 130 | your Emacs source directory, e.g.: | 130 | your Emacs source directory, e.g.: |
| 131 | 131 | ||
| 132 | cd /c/emacs/emacs-26 | 132 | cd /c/emacs/emacs-26 |