diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-29 22:06:33 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-29 22:06:33 -0700 |
commit | 20a09de953f437109a098fa8c4d380663d921481 (patch) | |
tree | eef1d8cc712d140e95f297bd00e9e2d058a36667 /nt/README.W32 | |
parent | e6fc3b147dded8d0833853491ad5e3d7b22f390e (diff) | |
parent | 3ab2f9bbb96d0425a9396e08b2f462de3fd7818d (diff) | |
download | emacs-20a09de953f437109a098fa8c4d380663d921481.tar.gz |
Merge from origin/emacs-26
3ab2f9bbb9 Merge from gnulib
cbc8324488 Prefer HTTPS to HTTP for gnu.org
bbda601d1d ; Spelling fixes
695cf5300b Wait for frame visibility with timeout in w32term too
e1f6e3127a Bring back the busy wait after x_make_frame_visible (Bug#2...
bccf635217 ; * src/gtkutil.c (xg_check_special_colors): Add another G...
26d58f0c58 ; Standardize license notices
61225964ed Revert "bug#28609: simple.el"
a75ab3b3fb bug#28609: simple.el
c7a21430c1 ; * etc/NEWS: Fix last change.
33401b26b1 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
d4b2bbdc73 Merge branch 'emacs-26' into scratch/org-mode-merge
c1ac8c170f Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
af130f900f Fix ert backtrace saving for non-`signal'ed errors (Bug#28...
7476eeaa23 Revert "Fix build on macOS (bug#28571)"
fec63089d5 Fix build on macOS (bug#28571)
0f9a78e770 Add tests for `css-current-defun-name'
88a0dd71f1 In w32fullscreen_hook don't add decorations to undecorated...
18073beb14 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
1eef11b7be Fix doc string of 'dired-listing-switches'
eaefbc26d5 ; Add files missing in ab351d442d7
ab351d442d Update Org to v9.1.1
Diffstat (limited to 'nt/README.W32')
-rw-r--r-- | nt/README.W32 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nt/README.W32 b/nt/README.W32 index f0f4997892a..829ccf7ba6c 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -275,7 +275,7 @@ See the end of the file for license conditions. This appendix is also available (as part of the entire manual) at - http://www.gnu.org/software/emacs/manual/html_mono/emacs.html#Microsoft-Windows + https://www.gnu.org/software/emacs/manual/html_mono/emacs.html#Microsoft-Windows In addition to the manual, there is a mailing list for help with Emacs here: @@ -325,4 +325,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. |