summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-09-29 22:06:33 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-09-29 22:06:33 -0700
commit20a09de953f437109a098fa8c4d380663d921481 (patch)
treeeef1d8cc712d140e95f297bd00e9e2d058a36667 /nt
parente6fc3b147dded8d0833853491ad5e3d7b22f390e (diff)
parent3ab2f9bbb96d0425a9396e08b2f462de3fd7818d (diff)
downloademacs-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')
-rw-r--r--nt/ChangeLog.12
-rw-r--r--nt/INSTALL2
-rw-r--r--nt/INSTALL.W642
-rw-r--r--nt/Makefile.in2
-rw-r--r--nt/README4
-rw-r--r--nt/README.W324
-rw-r--r--nt/addpm.c2
-rw-r--r--nt/cmdproxy.c2
-rwxr-xr-xnt/configure.bat2
-rw-r--r--nt/ddeclient.c2
-rw-r--r--nt/epaths.nt3
-rw-r--r--nt/gnulib-cfg.mk2
-rw-r--r--nt/inc/grp.h2
-rw-r--r--nt/inc/inttypes.h2
-rw-r--r--nt/inc/langinfo.h2
-rw-r--r--nt/inc/ms-w32.h2
-rw-r--r--nt/inc/nl_types.h2
-rw-r--r--nt/inc/stdint.h2
-rw-r--r--nt/inc/sys/resource.h2
-rw-r--r--nt/inc/sys/socket.h2
-rw-r--r--nt/inc/sys/stat.h2
-rw-r--r--nt/inc/sys/wait.h2
-rw-r--r--nt/preprep.c2
-rw-r--r--nt/runemacs.c2
24 files changed, 26 insertions, 27 deletions
diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1
index 0117639a8f6..adfdea286f0 100644
--- a/nt/ChangeLog.1
+++ b/nt/ChangeLog.1
@@ -3563,4 +3563,4 @@
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/>.
diff --git a/nt/INSTALL b/nt/INSTALL
index c6182c22cef..662a30406f5 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -820,4 +820,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/>.
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index f603883e830..5b7efdc8594 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -224,4 +224,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/>.
diff --git a/nt/Makefile.in b/nt/Makefile.in
index 7e911db7aa8..82158236308 100644
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -15,7 +15,7 @@
# 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/>.
# Avoid trouble on systems where the `SHELL' variable might be
# inherited from the environment.
diff --git a/nt/README b/nt/README
index 19ffd50f906..f4cca8efe7b 100644
--- a/nt/README
+++ b/nt/README
@@ -86,7 +86,7 @@
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 discussing
issues related to the Windows port of Emacs. For information about
@@ -140,4 +140,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/>.
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/>.
diff --git a/nt/addpm.c b/nt/addpm.c
index b034fffe29c..51f25106827 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -14,7 +14,7 @@ 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/>. */
/****************************************************************************
*
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 93e00973925..0b4d4375894 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -25,7 +25,7 @@ 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/>. */
#include <windows.h>
diff --git a/nt/configure.bat b/nt/configure.bat
index cd2a8f4f287..9705c66faa0 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -16,7 +16,7 @@ rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
rem GNU General Public License for more details.
rem You should have received a copy of the GNU General Public License
-rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
+rem along with GNU Emacs. If not, see https://www.gnu.org/licenses/.
rem ----------------------------------------------------------------------
echo ****************************************************************
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 15aeb842fc1..c370ef83ac5 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -14,7 +14,7 @@ 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/>. */
#include <windows.h>
#include <ddeml.h>
diff --git a/nt/epaths.nt b/nt/epaths.nt
index ebb4ccf6412..4f4f86a01a8 100644
--- a/nt/epaths.nt
+++ b/nt/epaths.nt
@@ -28,7 +28,7 @@ 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/>. */
/* Together with PATH_SITELOADSEARCH, this gives the default value of
@@ -85,4 +85,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Where Emacs should look for the application default file. */
#define PATH_X_DEFAULTS ""
-
diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk
index b75e36f5aa1..419099ece33 100644
--- a/nt/gnulib-cfg.mk
+++ b/nt/gnulib-cfg.mk
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this file. If not, see <http://www.gnu.org/licenses/>.
+# along with this file. If not, see <https://www.gnu.org/licenses/>.
# Gnulib modules to be omitted from Emacs.
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 82a8bab227b..0c3a8ecd64b 100644
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -15,7 +15,7 @@ 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/>. */
#ifndef _GRP_H
#define _GRP_H
diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index e5037b1fed5..e0905b74d7b 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -15,7 +15,7 @@ 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/>. */
#ifndef _REPL_INTTYPES_H
#define _REPL_INTTYPES_H
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index a20e59bee0f..88e12b59e84 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -15,7 +15,7 @@ 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/>. */
#ifndef _LANGINFO_H
#define _LANGINFO_H
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index e1dbe29bbb8..89aa94323d4 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -15,7 +15,7 @@ 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/>. */
/* Define symbols to identify the version of Unix this is.
Define all the symbols that apply correctly. */
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index 8236a6dba93..6ed0994c59d 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -15,7 +15,7 @@ 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/>. */
#ifndef _NL_TYPES_H
#define _NL_TYPES_H
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index 1e41ddb637a..c4fb98d2f91 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -15,7 +15,7 @@ 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/>. */
#ifndef _NT_STDINT_H_
#define _NT_STDINT_H_
diff --git a/nt/inc/sys/resource.h b/nt/inc/sys/resource.h
index 2964a643d35..de10aaee06e 100644
--- a/nt/inc/sys/resource.h
+++ b/nt/inc/sys/resource.h
@@ -15,7 +15,7 @@ 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/>. */
#ifndef INC_SYS_RESOURCE_H_
#define INC_SYS_RESOURCE_H_
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 32f6a1db6f1..b7c1103f21a 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -13,7 +13,7 @@ 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/>. */
/* Workable version of <sys/socket.h> based on winsock.h */
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h
index d686af1bc1f..2f1cf468736 100644
--- a/nt/inc/sys/stat.h
+++ b/nt/inc/sys/stat.h
@@ -16,7 +16,7 @@ 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/>. */
#ifndef INC_SYS_STAT_H_
#define INC_SYS_STAT_H_
diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h
index 6be7fd32448..51eae821b54 100644
--- a/nt/inc/sys/wait.h
+++ b/nt/inc/sys/wait.h
@@ -15,7 +15,7 @@ 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/>. */
#ifndef INC_SYS_WAIT_H_
#define INC_SYS_WAIT_H_
diff --git a/nt/preprep.c b/nt/preprep.c
index 73660351a0e..fc91628226f 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -14,7 +14,7 @@ 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/>.
Andrew Innes <andrewi@harlequin.co.uk> 16-Jan-1999
diff --git a/nt/runemacs.c b/nt/runemacs.c
index a98ff4be52c..d6e02b248dd 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -15,7 +15,7 @@ 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/>. */
/*
View Lorry Controller Status