[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b931e11: Merge from origin/emacs-28
|
From: |
Glenn Morris |
|
Subject: |
master b931e11: Merge from origin/emacs-28 |
|
Date: |
Sun, 24 Oct 2021 05:05:58 -0400 (EDT) |
branch: master
commit b931e11a03fdb44e378133b10f312e38b1b3d712
Merge: aea4af5 c7f5382
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-28
c7f53824a8 (origin/emacs-28) Update publicsuffix.txt from upstream
9a50f760e9 ; * doc/lispref/modes.texi (Hooks): Clarify wording. (Bug...
e154fd9119 Refer to the info node on keymaps in map-keymap docstring
4fd5c8df67 Clarify abnormal hook documentation
6fa5206770 Update to Org 9.5-59-g52e6f1
39413a45bf ; * doc/lispref/functions.texi (Calling Functions): Fix la...
43914ab01f Improve documentation of cl-reduce
ef37a86cac Improve documentation of apply-partially
1e8be48738 Fix typos
8c5fbd712b Revert commit 225ca617b7, and apply another fix
cdbd03345d Fix documentation of posn-at-x-y
598732c899 ; * src/vm-limit.c (get_lim_data): Fix a typo. (Bug#18238)
efdffd86c5 ; * etc/refcards/README: Prefer HTTPS in link.
# Conflicts:
# etc/NEWS
---
doc/emacs/cmdargs.texi | 2 +-
doc/lispref/commands.texi | 7 ++--
doc/lispref/functions.texi | 14 +++++--
doc/lispref/hooks.texi | 12 +++---
doc/lispref/modes.texi | 13 +++---
doc/misc/cl.texi | 10 +++--
doc/misc/org.org | 2 +-
etc/DEBUG | 2 +-
etc/NEWS.28 | 2 +-
etc/publicsuffix.txt | 98 +++++++++++++++++++++++++++-------------------
etc/refcards/README | 2 +-
lisp/minibuffer.el | 1 -
lisp/org/org-macro.el | 2 +-
lisp/org/org-version.el | 2 +-
lisp/shell.el | 14 ++++---
src/keymap.c | 3 ++
src/vm-limit.c | 2 +-
17 files changed, 113 insertions(+), 75 deletions(-)
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 313682b..86c04c8 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -273,7 +273,7 @@ system call unless otherwise requested.
@vindex backtrace-on-error-noninteractive
Errors that occur when running a @samp{--batch} Emacs will result in
-an Emacs Lisp backtrace being printed. To disable this behaviour, set
+an Emacs Lisp backtrace being printed. To disable this behavior, set
@code{backtrace-on-error-noninteractive} to @code{nil}.
@item --script @var{file}
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 8ad9df2..b38a83b 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2354,10 +2354,9 @@ This function returns position information corresponding
to pixel
coordinates @var{x} and @var{y} in a specified frame or window,
@var{frame-or-window}, which defaults to the selected window.
The coordinates @var{x} and @var{y} are relative to the
-frame or window used.
-If @var{whole} is @code{nil}, the coordinates are relative
-to the window text area, otherwise they are relative to
-the entire window area including scroll bars, margins and fringes.
+text area of the selected window.
+If @var{whole} is @code{non-nil}, the @var{x} coordinate is relative
+to the entire window area including scroll bars, margins and fringes.
@end defun
@node Accessing Scroll
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 3163300..33ef036 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -826,12 +826,20 @@ This function returns a new function which, when called,
will call
@var{func} with the list of arguments composed from @var{args} and
additional arguments specified at the time of the call. If @var{func}
accepts @var{n} arguments, then a call to @code{apply-partially} with
-@w{@code{@var{m} < @var{n}}} arguments will produce a new function of
-@w{@code{@var{n} - @var{m}}} arguments.
+@w{@code{@var{m} <= @var{n}}} arguments will produce a new function of
+@w{@code{@var{n} - @var{m}}} arguments@footnote{
+If the number of arguments that @var{func} can accept is unlimited,
+then the new function will also accept an unlimited number of
+arguments, so in that case @code{apply-partially} doesn't reduce the
+number of arguments that the new function could accept.
+}.
Here's how we could define the built-in function @code{1+}, if it
didn't exist, using @code{apply-partially} and @code{+}, another
-built-in function:
+built-in function@footnote{
+Note that unlike the built-in function, this version accepts any
+number of arguments.
+}:
@example
@group
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index feec8b2..e9d1e27 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -18,11 +18,13 @@ arguments and their values are completely ignored. The
recommended way
to put a new function on such a hook is to call @code{add-hook}.
@xref{Hooks}, for more information about using hooks.
-The variables whose names end in @samp{-functions} are usually @dfn{abnormal
-hooks} (some old code may also use the deprecated @samp{-hooks} suffix); their
-values are lists of functions, but these functions are called in a special way
-(they are passed arguments, or their return values are used). The variables
-whose names end in @samp{-function} have single functions as their values.
+The variables whose names end in @samp{-functions} are usually
+@dfn{abnormal hooks} (some old code may also use the deprecated
+@samp{-hooks} suffix). Their values are lists of functions, but these
+functions are called in a special way: they are either passed
+arguments, or their return values are used in some way. The variables
+whose names end in @samp{-function} have single functions as their
+values.
This is not an exhaustive list, it only covers the more general hooks.
For example, every major mode defines a hook named
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index d55df7d..1db991e 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -59,12 +59,13 @@ runs just before Emacs suspends itself (@pxref{Suspending
Emacs}).
@cindex abnormal hook
If the hook variable's name does not end with @samp{-hook}, that
-indicates it is probably an @dfn{abnormal hook}. That means the hook
-functions are called with arguments, or their return values are used
-in some way. The hook's documentation says how the functions are
-called. Any functions added to an abnormal hook must follow the
-hook's calling convention. By convention, abnormal hook names end in
-@samp{-functions}.
+indicates it is probably an @dfn{abnormal hook}. These differ from
+normal hooks in two ways: they can be called with one or more
+arguments, and their return values can be used in some way. The
+hook's documentation says how the functions are called and how their
+return values are used. Any functions added to an abnormal hook must
+follow the hook's calling convention. By convention, abnormal hook
+names end in @samp{-functions}.
@cindex single-function hook
If the name of the variable ends in @samp{-predicate} or
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 04e2c71..55b112c 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -3370,9 +3370,13 @@ true for all elements.
@end defun
@defun cl-reduce function seq @t{&key :from-end :start :end :initial-value
:key}
-This function combines the elements of @var{seq} using an associative
-binary operation. Suppose @var{function} is @code{*} and @var{seq} is
-the list @code{(2 3 4 5)}. The first two elements of the list are
+This function returns the result of calling @var{function} on the
+first and second element of @var{seq}, then calling @var{function}
+with that result and the third element of @var{seq}, then with that
+result and the third element of @var{seq}, etc.
+
+Here is an example. Suppose @var{function} is @code{*} and @var{seq}
+is the list @code{(2 3 4 5)}. The first two elements of the list are
combined with @code{(* 2 3) = 6}; this is combined with the next
element, @code{(* 6 4) = 24}, and that is combined with the final
element: @code{(* 24 5) = 120}. Note that the @code{*} function happens
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 5977f09..788e5ef 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16543,7 +16543,7 @@ more "bibliography" keywords.
#+bibliography: "/some/file/with spaces/in its name.bib"
#+end_example
-#+kindex: C-c C-x @
+#+kindex: C-c C-x @@
#+findex: org-cite-insert
One can then insert and edit citations using ~org-cite-insert~, called
with {{{kbd(C-c C-x @)}}}.
diff --git a/etc/DEBUG b/etc/DEBUG
index a1c0634..5553705 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -590,7 +590,7 @@ recommend to follow the procedure below to try to identify
the cause:
If you cannot figure out the cause for the problem using the above,
native-compile the problematic file after setting the variable
'comp-libgccjit-reproducer' to a non-nil value. That should produce a
-file names ELNFILENAME_libgccjit_repro.c, where ELNFILENAME is the
+file named ELNFILENAME_libgccjit_repro.c, where ELNFILENAME is the
name of the problematic .eln file, in the same directory where the
.eln file is produced. Then attach that reproducer C file to your bug
report.
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 4942a35..7f9797e 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -3239,7 +3239,7 @@ batch mode.
+++
** New mode 'repeat-mode' to allow shorter key sequences.
-Type 'M-x repeat-mode RET' to enable this mode. You can then type
+Type 'M-x repeat-mode' to enable this mode. You can then type
'C-x u u' instead of 'C-x u C-x u' to undo many changes, 'C-x o o'
instead of 'C-x o C-x o' to switch windows, 'C-x { { } } ^ ^ v v' to
resize the selected window interactively, 'M-g n n p p' to navigate
diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt
index 986f110..5cc95b9 100644
--- a/etc/publicsuffix.txt
+++ b/etc/publicsuffix.txt
@@ -175,17 +175,21 @@ it.ao
// aq : https://en.wikipedia.org/wiki/.aq
aq
-// ar : https://nic.ar/nic-argentina/normativa-vigente
+// ar : https://nic.ar/es/nic-argentina/normativa
ar
+bet.ar
com.ar
+coop.ar
edu.ar
gob.ar
gov.ar
int.ar
mil.ar
musica.ar
+mutual.ar
net.ar
org.ar
+senasa.ar
tur.ar
// arpa : https://en.wikipedia.org/wiki/.arpa
@@ -838,7 +842,13 @@ gov.cu
inf.cu
// cv : https://en.wikipedia.org/wiki/.cv
+// cv :
http://www.dns.cv/tldcv_portal/do?com=DS;5446457100;111;+PAGE(4000018)+K-CAT-CODIGO(RDOM)+RCNT(100);
<- registration rules
cv
+com.cv
+edu.cv
+int.cv
+nome.cv
+org.cv
// cw : http://www.una.cw/cw_registry/
// Confirmed by registry <registry@una.net> 2013-03-26
@@ -1175,6 +1185,7 @@ org.gu
web.gu
// gw : https://en.wikipedia.org/wiki/.gw
+// gw : https://nic.gw/regras/
gw
// gy : https://en.wikipedia.org/wiki/.gy
@@ -5849,7 +5860,7 @@ com.ps
org.ps
net.ps
-// pt : http://online.dns.pt/dns/start_dns
+// pt :
https://www.dns.pt/en/domain/pt-terms-and-conditions-registration-rules/
pt
net.pt
gov.pt
@@ -6202,29 +6213,22 @@ gov.tm
mil.tm
edu.tm
-// tn : https://en.wikipedia.org/wiki/.tn
-// http://whois.ati.tn/
+// tn : http://www.registre.tn/fr/
+// https://whois.ati.tn/
tn
com.tn
ens.tn
fin.tn
gov.tn
ind.tn
+info.tn
intl.tn
+mincom.tn
nat.tn
net.tn
org.tn
-info.tn
perso.tn
tourism.tn
-edunet.tn
-rnrt.tn
-rns.tn
-rnu.tn
-mincom.tn
-agrinet.tn
-defense.tn
-turen.tn
// to : https://en.wikipedia.org/wiki/.to
// Submitted by registry <egullich@colo.to>
@@ -7128,7 +7132,7 @@ org.zw
// newGTLDs
-// List of new gTLDs imported from
https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on
2021-08-19T15:13:52Z
+// List of new gTLDs imported from
https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on
2021-10-08T15:12:46Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
@@ -8018,7 +8022,7 @@ duck
// dunlop : 2015-07-02 The Goodyear Tire & Rubber Company
dunlop
-// dupont : 2015-06-25 E. I. du Pont de Nemours and Company
+// dupont : 2015-06-25 DuPont Specialty Products USA, LLC
dupont
// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
@@ -9452,9 +9456,6 @@ quebec
// quest : 2015-03-26 XYZ.COM LLC
quest
-// qvc : 2015-07-30 QVC, Inc.
-qvc
-
// racing : 2014-12-04 Premier Registry Limited
racing
@@ -9554,9 +9555,6 @@ rio
// rip : 2014-07-10 Dog Beach, LLC
rip
-// rmit : 2015-11-19 Royal Melbourne Institute of Technology
-rmit
-
// rocher : 2014-12-18 Ferrero Trading Lux S.A.
rocher
@@ -9902,9 +9900,6 @@ suzuki
// swatch : 2015-01-08 The Swatch Group Ltd
swatch
-// swiftcover : 2015-07-23 Swiftcover Insurance Services Limited
-swiftcover
-
// swiss : 2014-10-16 Swiss Confederation
swiss
@@ -10334,7 +10329,7 @@ xin
// xn--45q11c : 2013-11-21 Zodiac Gemini Ltd
八卦
-// xn--4gbrim : 2013-10-04 Fans TLD Limited
+// xn--4gbrim : 2013-10-04 Helium TLDs Ltd
موقع
// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
@@ -10803,6 +10798,10 @@ tele.amune.org
// Submitted by Apigee Security Team <security@apigee.com>
apigee.io
+// Apphud : https://apphud.com
+// Submitted by Alexander Selivanov <alex@apphud.com>
+siiites.com
+
// Appspace : https://www.appspace.com
// Submitted by Appspace Security Team <security@appspace.com>
appspacehosted.com
@@ -11054,10 +11053,6 @@ clerkstage.app
*.stg.dev
*.stgstage.dev
-// Clic2000 : https://clic2000.fr
-// Submitted by Mathilde Blanchemanche <mathilde@clic2000.fr>
-clic2000.net
-
// ClickRising : https://clickrising.com/
// Submitted by Umut Gumeli <infrastructure-publicsuffixlist@clickrising.com>
clickrising.net
@@ -11611,10 +11606,14 @@ ddnss.org
definima.net
definima.io
-// DigitalOcean : https://digitalocean.com/
-// Submitted by Braxton Huggins <bhuggins@digitalocean.com>
+// DigitalOcean App Platform :
https://www.digitalocean.com/products/app-platform/
+// Submitted by Braxton Huggins <psl-maintainers@digitalocean.com>
ondigitalocean.app
+// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
+// Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
+*.digitaloceanspaces.com
+
// dnstrace.pro : https://dnstrace.pro/
// Submitted by Chris Partridge <chris@partridge.tech>
bci.dnstrace.pro
@@ -11677,10 +11676,6 @@ tuleap-partners.com
onred.one
staging.onred.one
-// One.com: https://www.one.com/
-// Submitted by Jacob Bunk Nielsen <jbn@one.com>
-service.one
-
// EU.org https://eu.org/
// Submitted by Pierre Beyssac <hostmaster@eu.org>
eu.org
@@ -12079,6 +12074,7 @@ withyoutube.com
*.gateway.dev
cloud.goog
translate.goog
+*.usercontent.goog
cloudfunctions.net
blogspot.ae
blogspot.al
@@ -12521,6 +12517,7 @@ linkyard-cloud.ch
members.linode.com
*.nodebalancer.linode.com
*.linodeobjects.com
+ip.linodeusercontent.com
// LiquidNet Ltd : http://www.liquidnetlimited.com/
// Submitted by Victor Velchev <admin@liquidnetlimited.com>
@@ -12730,10 +12727,6 @@ that.win
from.work
to.work
-// NCTU.ME : https://nctu.me/
-// Submitted by Tocknicsu <admin@nctu.me>
-nctu.me
-
// Netlify : https://www.netlify.com
// Submitted by Jessica Parsons <jessica@netlify.com>
netlify.app
@@ -12926,6 +12919,10 @@ cloudycluster.net
// Submitted by Vicary Archangel <vicary@omniwe.com>
omniwe.site
+// One.com: https://www.one.com/
+// Submitted by Jacob Bunk Nielsen <jbn@one.com>
+service.one
+
// One Fold Media : http://www.onefoldmedia.com/
// Submitted by Eddie Jones <eddie@onefoldmedia.com>
nid.io
@@ -13066,6 +13063,10 @@ pstmn.io
mock.pstmn.io
httpbin.org
+//prequalifyme.today : https://prequalifyme.today
+//Submitted by DeepakTiwari deepak@ivylead.io
+prequalifyme.today
+
// prgmr.com : https://prgmr.com/
// Submitted by Sarah Newman <owner@prgmr.com>
xen.prgmr.com
@@ -13116,6 +13117,10 @@ qbuser.com
// Submitted by Scott Claeys <s.claeys@radwebhosting.com>
cloudsite.builders
+// Redgate Software: https://red-gate.com
+// Submitted by Andrew Farries <andrew.farries@red-gate.com>
+instances.spawn.cc
+
// Redstar Consultants : https://www.redstarconsultants.com/
// Submitted by Jons Slemmer <jons@redstarconsultants.com>
instantcloud.cn
@@ -13472,6 +13477,11 @@ tabitorder.co.il
// Submitted by Bjoern Henke <dev-server@taifun-software.de>
taifun-dns.de
+// Tailscale Inc. : https://www.tailscale.com
+// Submitted by David Anderson <danderson@tailscale.com>
+beta.tailscale.net
+ts.net
+
// TASK geographical domains (www.task.gda.pl/uslugi/dns)
gda.pl
gdansk.pl
@@ -13507,6 +13517,10 @@ reservd.dev.thingdust.io
reservd.disrec.thingdust.io
reservd.testing.thingdust.io
+// ticket i/O GmbH : https://ticket.io
+// Submitted by Christian Franke <it@ticket.io>
+tickets.io
+
// Tlon.io : https://tlon.io
// Submitted by Mark Staarink <mark@tlon.io>
arvo.network
@@ -13592,6 +13606,10 @@ inc.hk
virtualuser.de
virtual-user.de
+// Upli : https://upli.io
+// Submitted by Lenny Bakkalian <lenny.bakkalian@gmail.com>
+upli.io
+
// urown.net : https://urown.net
// Submitted by Hostmaster <hostmaster@urown.net>
urown.cloud
@@ -13740,7 +13758,7 @@ wpenginepowered.com
js.wpenginepowered.com
// Wix.com, Inc. : https://www.wix.com
-// Submitted by Shahar Talmi <shahart@wix.com>
+// Submitted by Shahar Talmi <shahar@wix.com>
wixsite.com
editorx.io
diff --git a/etc/refcards/README b/etc/refcards/README
index 94bf7b1..4102c85 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -5,7 +5,7 @@ See the end of the file for license conditions.
REFERENCE CARDS FOR GNU EMACS
To generate these refcards, you need to install the TeX document
-production system. For example, <http://www.tug.org/texlive/>.
+production system. For example, <https://www.tug.org/texlive/>.
All modern GNU/Linux distributions provide TeX packages, so the
easiest way is just to install those. Your distribution may have
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 13da7f9..bc21f02 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3214,7 +3214,6 @@ See `read-file-name' for the meaning of the arguments."
(unless val (error "No file name specified"))
(if (and default-filename
- (not (file-remote-p dir))
(string-equal val (if (consp insdef) (car insdef) insdef)))
(setq val default-filename))
(setq val (substitute-in-file-name val))
diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el
index b8d3373..1259430 100644
--- a/lisp/org/org-macro.el
+++ b/lisp/org/org-macro.el
@@ -125,7 +125,7 @@ previous one, unless VALUE is nil. Return the updated
list."
"Collect macro definitions in current buffer and setup files.
Return an alist containing all macro templates found."
(let ((templates
- `(("author" . ,(org-macro--find-keyword-value "AUTHOR"))
+ `(("author" . ,(org-macro--find-keyword-value "AUTHOR" t))
("email" . ,(org-macro--find-keyword-value "EMAIL"))
("title" . ,(org-macro--find-keyword-value "TITLE" t))
("date" . ,(org-macro--find-date)))))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 4464459..55f186b 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(defun org-git-version ()
"The Git version of Org mode.
Inserted by installing Org or when a release is made."
- (let ((org-git-version "release_9.5-57-g9bc3a2"))
+ (let ((org-git-version "release_9.5-59-g52e6f1"))
org-git-version))
(provide 'org-version)
diff --git a/lisp/shell.el b/lisp/shell.el
index b575024..cb4afe6 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -766,12 +766,16 @@ Make the shell buffer the current buffer, and return it.
(called-interactively-p 'any)
(null explicit-shell-file-name)
(null (getenv "ESHELL")))
+ ;; `expand-file-name' shall not add the MS Windows volume letter
+ ;; (Bug#49229).
(setq-local explicit-shell-file-name
- (file-local-name
- (expand-file-name
- (read-file-name "Remote shell path: " default-directory
- shell-file-name t shell-file-name
- #'file-remote-p)))))
+ (replace-regexp-in-string
+ "^[[:alpha:]]:" ""
+ (file-local-name
+ (expand-file-name
+ (read-file-name "Remote shell path: " default-directory
+ shell-file-name t shell-file-name
+ #'file-remote-p))))))
;; Rain or shine, BUFFER must be current by now.
(unless (comint-check-proc buffer)
diff --git a/src/keymap.c b/src/keymap.c
index ca1dbe3..8b521a8 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -629,6 +629,9 @@ the definition it is bound to. The event may be a
character range.
If KEYMAP has a parent, the parent's bindings are included as well.
This works recursively: if the parent has itself a parent, then the
grandparent's bindings are also included and so on.
+
+For more information, see Info node `(elisp) Keymaps'.
+
usage: (map-keymap FUNCTION KEYMAP) */)
(Lisp_Object function, Lisp_Object keymap, Lisp_Object sort_first)
{
diff --git a/src/vm-limit.c b/src/vm-limit.c
index b9058d0..e054765 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -126,7 +126,7 @@ get_lim_data (void)
dos_memory_info (&totalram, &freeram, &totalswap, &freeswap);
lim_data = freeram;
- /* Don't believe they will give us more that 0.5 GB. */
+ /* Don't believe they will give us more than 0.5 GB. */
if (lim_data > 512U * 1024U * 1024U)
lim_data = 512U * 1024U * 1024U;
}