Merge branch 'master' of https://github.com/emacs-mirror/emacs into pgtk

Author: Yuuki Harano

.gitattributes

@@ -1,6 +1,6 @@
 # Attributes of Emacs files in the Git repository.
 
-# Copyright 2015-2019 Free Software Foundation, Inc.
+# Copyright 2015-2020 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 

.gitignore

@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2019 Free Software Foundation, Inc.
+# Copyright 2009-2020 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -135,6 +135,7 @@ src/gl-stamp
 *.o
 *.res
 *.so
+*.dylib
 core
 core.*[0-9]
 gmon.out

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 Free Software Foundation, Inc.
+# Copyright (C) 2017-2020 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -32,7 +32,7 @@ variables:
 
 before_script:
   - apt update -qq
-  - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gnutls-dev git
+  - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev git
 
 stages:
   - test

ChangeLog.1

@@ -14700,7 +14700,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

ChangeLog.2

@@ -35787,7 +35787,7 @@ See ChangeLog.1 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2015-2019 Free Software Foundation, Inc.
+  Copyright (C) 2015-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

ChangeLog.3

@@ -2,7 +2,6 @@
 
 	* etc/AUTHORS: Update.
 
-2019-08-29  Nicolas Petton  <nicolas@petton.fr>
 2019-08-29  Nicolas Petton  <nicolas@petton.fr>
 
 	* etc/NEWS: Delete temporary markup.
@@ -64939,7 +64938,8 @@
 
 	(eww-setup-buffer): Restore left-to-right defaults
 
-	* eww.el (eww-setup-buffer): Restore left-to-right defaults.
+	* lisp/net/eww.el (eww-setup-buffer): Restore left-to-right
+	defaults.
 
 2015-12-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -64955,7 +64955,8 @@
 
 2015-12-26  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	* shr.el (shr-descend): Allow using lambdas in external functions.
+	* lisp/net/shr.el (shr-descend): Allow using lambdas in external
+	functions.
 
 2015-12-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -65022,7 +65023,8 @@
 
 2015-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	* eww.el (eww-display-html): Support <button> tags (bug#20485).
+	* lisp/net/eww.el (eww-display-html): Support <button> tags
+	(bug#20485).
 
 2015-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -65048,7 +65050,8 @@
 
 2015-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	* eww.el (eww-mode-map): Fix command name of eww-toggle-colors.
+	* lisp/net/eww.el (eww-mode-map): Fix command name of
+	eww-toggle-colors.
 
 2015-12-25  Samer Masterson  <samer@samertm.com>
 
@@ -65072,38 +65075,39 @@
 
 	Follow meta refresh tags in eww
 
-	* eww.el (eww-tag-meta): Follow meta refresh tags (bug#22234).
+	* lisp/net/eww.el (eww-tag-meta): Follow meta refresh tags
+	(bug#22234).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	More eww file name coding fixes
 
-	* eww.el (eww-decode-url-file-name): Use the base coding
+	* lisp/net/eww.el (eww-decode-url-file-name): Use the base coding
 	system to check for encodability.
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	Always save eww history
 
-	* eww.el (eww-setup-buffer): Always save history, even when
-	called from outside the eww buffer (bug#19638).
+	* lisp/net/eww.el (eww-setup-buffer): Always save history, even
+	when called from outside the eww buffer (bug#19638).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	Default web pages to right-to-left
 
-	* eww.el (eww-mode): Most web pages are left-to-right, so make
-	that the default (bug#19801).
+	* lisp/net/eww.el (eww-mode): Most web pages are left-to-right,
+	so make that the default (bug#19801).
 
-	* shr.el (shr-tag-html): Respect "dir" attributes
+	* lisp/net/shr.el (shr-tag-html): Respect "dir" attributes
 	(left-to-right, right-to-left).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	Make toggling checkboxes work again
 
-	* eww.el (eww-update-field): Make toggling checkboxes work
-	again (bug#21881).
+	* lisp/net/eww.el (eww-update-field): Make toggling checkboxes
+	work again (bug#21881).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -65118,8 +65122,8 @@
 
 	Fixes: 22117
 
-	* shr.el (shr-descend): Stop rendering before we run out of
-	specpdl room (bug#22117).
+	* lisp/net/shr.el (shr-descend): Stop rendering before we run out
+	of specpdl room (bug#22117).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -65129,7 +65133,7 @@
 
 	Allow several <tbody> tags in shr
 
-	* shr.el (shr-table-body): New function to find the real body
+	* lisp/net/shr.el (shr-table-body): New function to find the real body
 	of a table.
 	(shr-tag-table): Use it to render several <tbody> tags in a
 	table (bug#22170).
@@ -65145,7 +65149,7 @@
 
 	Decode hex-encoded URLs before using them as file names
 
-	* eww.el (eww-decode-url-file-name): New function.
+	* lisp/net/eww.el (eww-decode-url-file-name): New function.
 	(eww-download-callback): Use it to decode file names before
 	saving them.
 
@@ -65162,23 +65166,23 @@
 
 	Allow overriding shr functions from eww
 
-	* eww.el (eww-display-html): Allow overriding elements in
+	* lisp/net/eww.el (eww-display-html): Allow overriding elements in
 	`shr-external-rendering-functions'.
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	Ignore invalid SVG images
 
-	* shr.el (shr-tag-svg): Ignore SVG images that have no width
-	or height, because these can't be displayed by ImageMagick,
+	* lisp/net/shr.el (shr-tag-svg): Ignore SVG images that have no
+	width or height, because these can't be displayed by ImageMagick,
 	anyway.
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	shr table rendering fix
 
-	* shr.el (shr-tag-table): Allow rendering body-less tables
-	that have headers.
+	* lisp/net/shr.el (shr-tag-table): Allow rendering body-less
+	tables that have headers.
 
 2015-12-22  Sam Steingold  <sds@gnu.org>
 
@@ -66531,7 +66535,7 @@ See ChangeLog.1 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2015-2019 Free Software Foundation, Inc.
+  Copyright (C) 2015-2020 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

GNUmakefile

@@ -1,6 +1,6 @@
 # Build Emacs from a fresh tarball or version-control checkout.
 
-# Copyright (C) 2011-2019 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #

INSTALL

@@ -1,5 +1,5 @@
 GNU Emacs Installation Guide
-Copyright (C) 1992, 1994, 1996-1997, 2000-2019 Free Software Foundation,
+Copyright (C) 1992, 1994, 1996-1997, 2000-2020 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 

INSTALL.REPO

@@ -83,7 +83,7 @@ never platform-specific.
 
 
 
-Copyright (C) 2002-2019 Free Software Foundation, Inc.
+Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 

Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1992-2019 Free Software Foundation, Inc.
+# Copyright (C) 1992-2020 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.