Skip to content

Commit 26b167d

Browse files
author
Yuuki Harano
committed
Merge branch 'master' of https://github.com/emacs-mirror/emacs into pgtk
2 parents 3313e53 + 9d38564 commit 26b167d

File tree

2,813 files changed

+5344
-4651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,813 files changed

+5344
-4651
lines changed

‎.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Attributes of Emacs files in the Git repository.
22

3-
# Copyright 2015-2019 Free Software Foundation, Inc.
3+
# Copyright 2015-2020 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Files that Git should ignore in the Emacs source directory.
22

3-
# Copyright 2009-2019 Free Software Foundation, Inc.
3+
# Copyright 2009-2020 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

@@ -135,6 +135,7 @@ src/gl-stamp
135135
*.o
136136
*.res
137137
*.so
138+
*.dylib
138139
core
139140
core.*[0-9]
140141
gmon.out

‎.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2017-2019 Free Software Foundation, Inc.
1+
# Copyright (C) 2017-2020 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Emacs.
44
#
@@ -32,7 +32,7 @@ variables:
3232

3333
before_script:
3434
- apt update -qq
35-
- 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
35+
- 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
3636

3737
stages:
3838
- test

‎ChangeLog.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14700,7 +14700,7 @@
1470014700
;; coding: utf-8
1470114701
;; End:
1470214702

14703-
Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
14703+
Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc.
1470414704

1470514705
This file is part of GNU Emacs.
1470614706

‎ChangeLog.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35787,7 +35787,7 @@ See ChangeLog.1 for earlier changes.
3578735787
;; coding: utf-8
3578835788
;; End:
3578935789

35790-
Copyright (C) 2015-2019 Free Software Foundation, Inc.
35790+
Copyright (C) 2015-2020 Free Software Foundation, Inc.
3579135791

3579235792
This file is part of GNU Emacs.
3579335793

‎ChangeLog.3

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
* etc/AUTHORS: Update.
44

5-
2019-08-29 Nicolas Petton <[email protected]>
65
2019-08-29 Nicolas Petton <[email protected]>
76

87
* etc/NEWS: Delete temporary markup.
@@ -64939,7 +64938,8 @@
6493964938

6494064939
(eww-setup-buffer): Restore left-to-right defaults
6494164940

64942-
* eww.el (eww-setup-buffer): Restore left-to-right defaults.
64941+
* lisp/net/eww.el (eww-setup-buffer): Restore left-to-right
64942+
defaults.
6494364943

6494464944
2015-12-27 Lars Ingebrigtsen <[email protected]>
6494564945

@@ -64955,7 +64955,8 @@
6495564955

6495664956
2015-12-26 Lars Ingebrigtsen <[email protected]>
6495764957

64958-
* shr.el (shr-descend): Allow using lambdas in external functions.
64958+
* lisp/net/shr.el (shr-descend): Allow using lambdas in external
64959+
functions.
6495964960

6496064961
2015-12-25 Stefan Monnier <[email protected]>
6496164962

@@ -65022,7 +65023,8 @@
6502265023

6502365024
2015-12-25 Lars Ingebrigtsen <[email protected]>
6502465025

65025-
* eww.el (eww-display-html): Support <button> tags (bug#20485).
65026+
* lisp/net/eww.el (eww-display-html): Support <button> tags
65027+
(bug#20485).
6502665028

6502765029
2015-12-25 Lars Ingebrigtsen <[email protected]>
6502865030

@@ -65048,7 +65050,8 @@
6504865050

6504965051
2015-12-25 Lars Ingebrigtsen <[email protected]>
6505065052

65051-
* eww.el (eww-mode-map): Fix command name of eww-toggle-colors.
65053+
* lisp/net/eww.el (eww-mode-map): Fix command name of
65054+
eww-toggle-colors.
6505265055

6505365056
2015-12-25 Samer Masterson <[email protected]>
6505465057

@@ -65072,38 +65075,39 @@
6507265075

6507365076
Follow meta refresh tags in eww
6507465077

65075-
* eww.el (eww-tag-meta): Follow meta refresh tags (bug#22234).
65078+
* lisp/net/eww.el (eww-tag-meta): Follow meta refresh tags
65079+
(bug#22234).
6507665080

6507765081
2015-12-24 Lars Ingebrigtsen <[email protected]>
6507865082

6507965083
More eww file name coding fixes
6508065084

65081-
* eww.el (eww-decode-url-file-name): Use the base coding
65085+
* lisp/net/eww.el (eww-decode-url-file-name): Use the base coding
6508265086
system to check for encodability.
6508365087

6508465088
2015-12-24 Lars Ingebrigtsen <[email protected]>
6508565089

6508665090
Always save eww history
6508765091

65088-
* eww.el (eww-setup-buffer): Always save history, even when
65089-
called from outside the eww buffer (bug#19638).
65092+
* lisp/net/eww.el (eww-setup-buffer): Always save history, even
65093+
when called from outside the eww buffer (bug#19638).
6509065094

6509165095
2015-12-24 Lars Ingebrigtsen <[email protected]>
6509265096

6509365097
Default web pages to right-to-left
6509465098

65095-
* eww.el (eww-mode): Most web pages are left-to-right, so make
65096-
that the default (bug#19801).
65099+
* lisp/net/eww.el (eww-mode): Most web pages are left-to-right,
65100+
so make that the default (bug#19801).
6509765101

65098-
* shr.el (shr-tag-html): Respect "dir" attributes
65102+
* lisp/net/shr.el (shr-tag-html): Respect "dir" attributes
6509965103
(left-to-right, right-to-left).
6510065104

6510165105
2015-12-24 Lars Ingebrigtsen <[email protected]>
6510265106

6510365107
Make toggling checkboxes work again
6510465108

65105-
* eww.el (eww-update-field): Make toggling checkboxes work
65106-
again (bug#21881).
65109+
* lisp/net/eww.el (eww-update-field): Make toggling checkboxes
65110+
work again (bug#21881).
6510765111

6510865112
2015-12-24 Lars Ingebrigtsen <[email protected]>
6510965113

@@ -65118,8 +65122,8 @@
6511865122

6511965123
Fixes: 22117
6512065124

65121-
* shr.el (shr-descend): Stop rendering before we run out of
65122-
specpdl room (bug#22117).
65125+
* lisp/net/shr.el (shr-descend): Stop rendering before we run out
65126+
of specpdl room (bug#22117).
6512365127

6512465128
2015-12-24 Lars Ingebrigtsen <[email protected]>
6512565129

@@ -65129,7 +65133,7 @@
6512965133

6513065134
Allow several <tbody> tags in shr
6513165135

65132-
* shr.el (shr-table-body): New function to find the real body
65136+
* lisp/net/shr.el (shr-table-body): New function to find the real body
6513365137
of a table.
6513465138
(shr-tag-table): Use it to render several <tbody> tags in a
6513565139
table (bug#22170).
@@ -65145,7 +65149,7 @@
6514565149

6514665150
Decode hex-encoded URLs before using them as file names
6514765151

65148-
* eww.el (eww-decode-url-file-name): New function.
65152+
* lisp/net/eww.el (eww-decode-url-file-name): New function.
6514965153
(eww-download-callback): Use it to decode file names before
6515065154
saving them.
6515165155

@@ -65162,23 +65166,23 @@
6516265166

6516365167
Allow overriding shr functions from eww
6516465168

65165-
* eww.el (eww-display-html): Allow overriding elements in
65169+
* lisp/net/eww.el (eww-display-html): Allow overriding elements in
6516665170
`shr-external-rendering-functions'.
6516765171

6516865172
2015-12-24 Lars Ingebrigtsen <[email protected]>
6516965173

6517065174
Ignore invalid SVG images
6517165175

65172-
* shr.el (shr-tag-svg): Ignore SVG images that have no width
65173-
or height, because these can't be displayed by ImageMagick,
65176+
* lisp/net/shr.el (shr-tag-svg): Ignore SVG images that have no
65177+
width or height, because these can't be displayed by ImageMagick,
6517465178
anyway.
6517565179

6517665180
2015-12-24 Lars Ingebrigtsen <[email protected]>
6517765181

6517865182
shr table rendering fix
6517965183

65180-
* shr.el (shr-tag-table): Allow rendering body-less tables
65181-
that have headers.
65184+
* lisp/net/shr.el (shr-tag-table): Allow rendering body-less
65185+
tables that have headers.
6518265186

6518365187
2015-12-22 Sam Steingold <[email protected]>
6518465188

@@ -66531,7 +66535,7 @@ See ChangeLog.1 for earlier changes.
6653166535
;; coding: utf-8
6653266536
;; End:
6653366537

66534-
Copyright (C) 2015-2019 Free Software Foundation, Inc.
66538+
Copyright (C) 2015-2020 Free Software Foundation, Inc.
6653566539

6653666540
This file is part of GNU Emacs.
6653766541

‎GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build Emacs from a fresh tarball or version-control checkout.
22

3-
# Copyright (C) 2011-2019 Free Software Foundation, Inc.
3+
# Copyright (C) 2011-2020 Free Software Foundation, Inc.
44
#
55
# This file is part of GNU Emacs.
66
#

‎INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GNU Emacs Installation Guide
2-
Copyright (C) 1992, 1994, 1996-1997, 2000-2019 Free Software Foundation,
2+
Copyright (C) 1992, 1994, 1996-1997, 2000-2020 Free Software Foundation,
33
Inc.
44
See the end of the file for license conditions.
55

‎INSTALL.REPO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ never platform-specific.
8383

8484

8585

86-
Copyright (C) 2002-2019 Free Software Foundation, Inc.
86+
Copyright (C) 2002-2020 Free Software Foundation, Inc.
8787

8888
This file is part of GNU Emacs.
8989

‎Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### @configure_input@
22

3-
# Copyright (C) 1992-2019 Free Software Foundation, Inc.
3+
# Copyright (C) 1992-2020 Free Software Foundation, Inc.
44

55
# This file is part of GNU Emacs.
66

0 commit comments

Comments
 (0)