mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-30

Browse source 
a478423d19 * lisp/progmodes/peg.el (peg-syntax-classes): Typo (bug#7...
951fb93956 * lisp/transient.el (static-if): Remove duplicated defini...
0218fb2143 Adapt file-remote-p doc
34c1094e60 ; Fix typo in etc/ORG-NEWS (Bug#72186)
5916b172bd * etc/TODO: Delete item about merging Magit.
a6cab228d4 ; Fix typos
41dc28244f * doc/man/emacs.1.in: Add "No warranty" notice.
b2ac343586 ; * doc/man/emacs.1.in: Improve wording.
110b3d08d7 Improve emacs man page description of --user flag
4911f08912 Checkdoc fixes in allout-widgets.el
109b592d77 Checkdoc fixes in subr.el
4643672078 Checkdoc fixes in touch-screen.el
9889774c62 Checkdoc fixes in treesit.el

# Conflicts:
#	etc/NEWS
This commit is contained in:
Stefan Monnier 2024-07-19 14:31:53 -04:00
commit 153732e638
83 changed files with 297 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.3
View file

@ -997,7 +997,7 @@
2022-07-11 Stefan Kangas <stefan@marxist.se> 2022-07-11 Stefan Kangas <stefan@marxist.se>
* lisp/find-dired.el (find-dired): Doc fix; add crossreference. * lisp/find-dired.el (find-dired): Doc fix; add cross-reference.
2022-07-08 Stefan Kangas <stefan@marxist.se> 2022-07-08 Stefan Kangas <stefan@marxist.se>
@ -141854,7 +141854,7 @@
client key/cert specification. client key/cert specification.
* doc/misc/emacs-gnutls.texi (Help For Developers): Describe usage of * doc/misc/emacs-gnutls.texi (Help For Developers): Describe usage of
optional plist argument. Add crossreference to description of optional plist argument. Add cross-reference to description of
.authinfo format for client key/cert specification. .authinfo format for client key/cert specification.
* etc/NEWS: Describe new client certificate functionality for * etc/NEWS: Describe new client certificate functionality for

6
ChangeLog.4
View file

@ -49037,7 +49037,7 @@
2022-07-11 Stefan Kangas <stefan@marxist.se> 2022-07-11 Stefan Kangas <stefan@marxist.se>
* lisp/find-dired.el (find-dired): Doc fix; add crossreference. * lisp/find-dired.el (find-dired): Doc fix; add cross-reference.
2022-07-11 Stefan Kangas <stefan@marxist.se> 2022-07-11 Stefan Kangas <stefan@marxist.se>
@ -78967,7 +78967,7 @@
This abstracts out the somewhat-unusual "insert&delete" logic in This abstracts out the somewhat-unusual "insert&delete" logic in
'eshell-parse-command' so that it can be used elsewhere, and also 'eshell-parse-command' so that it can be used elsewhere, and also
ensures that the deletion occurs even if an an error occurs. ensures that the deletion occurs even if an error occurs.
* lisp/eshell/esh-cmd.el (eshell-with-temp-command): New macro. * lisp/eshell/esh-cmd.el (eshell-with-temp-command): New macro.
(eshell-parse-command): Use it. (eshell-parse-command): Use it.
@ -82043,7 +82043,7 @@
(BClipboard_set_system_data) (BClipboard_set_system_data)
(BClipboard_set_primary_selection_data) (BClipboard_set_primary_selection_data)
(BClipboard_set_secondary_selection_data): Store count before (BClipboard_set_secondary_selection_data): Store count before
saving to the the clipboard. saving to the clipboard.
(BClipboard_owns_clipboard, BClipboard_owns_primary) (BClipboard_owns_clipboard, BClipboard_owns_primary)
(BClipboard_owns_secondary): Adjust tests accordingly. (BClipboard_owns_secondary): Adjust tests accordingly.

1
admin/codespell/codespell.exclude
View file

@ -1684,3 +1684,4 @@ argument \\='general-category, is Decimal_Numbers (Nd). It returns
((or (string-equal tag "anc") (string-equal tag "ancestor")) ((or (string-equal tag "anc") (string-equal tag "ancestor"))
("ro" :default "Continuare de pe pagina precedentă") ("ro" :default "Continuare de pe pagina precedentă")
("ro" :default "Continuare pe pagina următoare") ("ro" :default "Continuare pe pagina următoare")
;; avk@rtsg.mot.com (Andrew V. Klein) for a Dired tip.

7
admin/codespell/codespell.ignore
View file

@ -9,18 +9,14 @@ blocs
callint callint
checkin checkin
clen clen
crossreference
crossreferences
debbugs debbugs
dedented dedented
dependant dependant
doas
ede ede
grey grey
gud gud
ifset ifset
inout inout
keypair
keyserver keyserver
keyservers keyservers
lightening lightening
@ -28,7 +24,6 @@ mapp
master master
mimicks mimicks
mitre mitre
msdos
ot ot
parm parm
parms parms
@ -37,8 +32,6 @@ reenable
reenabled reenabled
requestor requestor
sie sie
spawnve
statics statics
stdio
texline texline
typdef typdef

2
admin/notes/copyright
View file

@ -302,7 +302,7 @@ doc/*/doclicense.texi
doc/*/*.texi - All manuals should be under GFDL (but see below), and doc/*/*.texi - All manuals should be under GFDL (but see below), and
should include a copy of it, so that they can be distributed should include a copy of it, so that they can be distributed
separately. faq.texi has a different license, for some reason no-one separately. efaq.texi has a different license, for some reason no-one
can remember. can remember.
https://lists.gnu.org/r/emacs-devel/2007-04/msg00583.html https://lists.gnu.org/r/emacs-devel/2007-04/msg00583.html
https://lists.gnu.org/r/emacs-devel/2007-04/msg00618.html https://lists.gnu.org/r/emacs-devel/2007-04/msg00618.html

2
admin/notes/multi-tty
View file

@ -325,7 +325,7 @@ THINGS TO DO
example, custom's buttons are broken on non-initial device types. example, custom's buttons are broken on non-initial device types.
** Possibly turn off the double C-g feature when there is an X frame. ** Possibly turn off the double C-g feature when there is an X frame.
C.f. (emacs)Emergency Escape. Cf. (emacs)Emergency Escape.
** frames-on-display-list should also accept frames. ** frames-on-display-list should also accept frames.

20
admin/notes/tree-sitter/starter-guide
View file

@ -58,7 +58,7 @@ To build them yourself, run
and language definitions will be in the /dist directory. You can and language definitions will be in the /dist directory. You can
either copy them to standard dynamic library locations of your system, either copy them to standard dynamic library locations of your system,
eg, /usr/local/lib, or leave them in /dist and later tell Emacs where e.g., /usr/local/lib, or leave them in /dist and later tell Emacs where
to find language definitions by setting ‘treesit-extra-load-path’. to find language definitions by setting ‘treesit-extra-load-path’.
Language definition sources can be found on GitHub under Language definition sources can be found on GitHub under
@ -135,7 +135,7 @@ There are two types of nodes, named, like (identifier),
(parent (child) (child) (child (grand_child))) (parent (child) (child) (child (grand_child)))
Eg, an argument list (1, "3", 1) could be: For example, an argument list (1, "3", 1) could be:
(argument_list "(" (number) (string) (number) ")") (argument_list "(" (number) (string) (number) ")")
@ -269,10 +269,10 @@ Indent works like this: We have a bunch of rules that look like
When the indentation process starts, point is at the BOL of a line, we When the indentation process starts, point is at the BOL of a line, we
want to know which column to indent this line to. Let NODE be the node want to know which column to indent this line to. Let NODE be the node
at point, we pass this node to the MATCHER of each rule, one of them at point, we pass this node to the MATCHER of each rule, one of them
will match the node (eg, "this node is a closing bracket!"). Then we will match the node (e.g., "this node is a closing bracket!"). Then we
pass the node to the ANCHOR, which returns a point, eg, the BOL of the pass the node to the ANCHOR, which returns a point, e.g., the BOL of the
previous line. We find the column number of that point (eg, 4), add previous line. We find the column number of that point (e.g., 4), add
OFFSET to it (eg, 0), and that is the column we want to indent the OFFSET to it (e.g., 0), and that is the column we want to indent the
current line to (4 + 0 = 4). current line to (4 + 0 = 4).
Matchers and anchors are functions that takes (NODE PARENT BOL &rest Matchers and anchors are functions that takes (NODE PARENT BOL &rest
@ -289,8 +289,8 @@ For MATCHER we have
(match NODE-TYPE PARENT-TYPE NODE-FIELD (match NODE-TYPE PARENT-TYPE NODE-FIELD
NODE-INDEX-MIN NODE-INDEX-MAX) NODE-INDEX-MIN NODE-INDEX-MAX)
=> checks everything. If an argument is nil, don’t match that. Eg, => checks everything. If an argument is nil, don’t match that.
(match nil TYPE) is the same as (parent-is TYPE) E.g., (match nil TYPE) is the same as (parent-is TYPE)
For ANCHOR we have For ANCHOR we have
@ -439,13 +439,13 @@ error highlight parse error
Abstract features: Abstract features:
assignment: the LHS of an assignment (thing being assigned to), eg: assignment: the LHS of an assignment (thing being assigned to), e.g.:
a = b <--- highlight a a = b <--- highlight a
a.b = c <--- highlight b a.b = c <--- highlight b
a[1] = d <--- highlight a a[1] = d <--- highlight a
definition: the thing being defined, eg: definition: the thing being defined, e.g.:
int a(int b) { <--- highlight a int a(int b) { <--- highlight a
return 0 return 0

5
admin/nt/dist-build/README-scripts
View file

@ -44,7 +44,8 @@ build-zips.sh file will create this for you.
~/emacs-build/deps ~/emacs-build/deps
A location for the dependencies. This needs to contain two zip files A location for the dependencies. This needs to contain two zip files
with the dependencies. build-dep-zips.py will create these files for you. with the dependencies. build-dep-zips.py will create these files for
you.
~/emacs-build/deps/libXpm ~/emacs-build/deps/libXpm
@ -137,7 +138,7 @@ version (e.g emacs-27.0.50.zip).
### For snapshots from another branch ### For snapshots from another branch
Snapshots can be build from any other branch. There is rarely a need Snapshots can be built from any other branch. There is rarely a need
to do this, except where some significant, wide-ranging feature is to do this, except where some significant, wide-ranging feature is
being added on a feature branch. In this case, the branch can be being added on a feature branch. In this case, the branch can be
given using `build-zips.sh -b pdumper -s` for example. Any "/" given using `build-zips.sh -b pdumper -s` for example. Any "/"

1
admin/run-codespell
View file

@ -42,6 +42,7 @@ emacs_run_codespell ()
git ls-files |\ git ls-files |\
grep -v -E -e '^(lib|m4)/.*' |\ grep -v -E -e '^(lib|m4)/.*' |\
grep -v -E -e '^admin/(charsets|codespell|unidata)/.*' |\ grep -v -E -e '^admin/(charsets|codespell|unidata)/.*' |\
grep -v -E -e '^doc/lispref/spellfile$' |\
grep -v -E -e '^doc/misc/texinfo.tex$' |\ grep -v -E -e '^doc/misc/texinfo.tex$' |\
grep -v -E -e '^doc/translations/.*' |\ grep -v -E -e '^doc/translations/.*' |\
grep -v -E -e '^etc/(AUTHORS|HELLO|publicsuffix.txt)$' |\ grep -v -E -e '^etc/(AUTHORS|HELLO|publicsuffix.txt)$' |\

2
doc/emacs/ack.texi
View file

@ -247,7 +247,7 @@ generating JSON files.
@item @item
Andrea Corallo was the Emacs (co-)maintainer from 29.3 onwards. Andrea Corallo was the Emacs (co-)maintainer from 29.3 onwards.
He wrote the native compilation support in @file{comp.c} and He wrote the native compilation support in @file{comp.c} and
and @file{comp.el}, for compiling Emacs Lisp to native code using @file{comp.el}, for compiling Emacs Lisp to native code using
@samp{libgccjit}. @samp{libgccjit}.
@item @item

2
doc/emacs/android.texi
View file

@ -267,7 +267,7 @@ system.
@cindex temp~unlinked.NNNN files, Android @cindex temp~unlinked.NNNN files, Android
On Android devices running very old (2.6.29) versions of the Linux On Android devices running very old (2.6.29) versions of the Linux
kernel, Emacs needs to create files named starting with kernel, Emacs needs to create files named starting with
@file{temp~unlinked} in the the temporary file directory in order to @file{temp~unlinked} in the temporary file directory in order to
read from asset files. Do not create files with such names yourself, read from asset files. Do not create files with such names yourself,
or they may be overwritten or removed. or they may be overwritten or removed.

2
doc/emacs/emacs.texi
View file

@ -1351,7 +1351,7 @@ when and how to report Emacs bugs (@pxref{Bugs}).
To find the documentation of a particular command, look in the index. To find the documentation of a particular command, look in the index.
Keys (character commands) and command names have separate indexes. Keys (character commands) and command names have separate indexes.
There is also a glossary, with a cross reference for each term. There is also a glossary, with a cross-reference for each term.
This manual is available as a printed book and also as an Info file. This manual is available as a printed book and also as an Info file.
The Info file is for reading from Emacs itself, or with the Info program. The Info file is for reading from Emacs itself, or with the Info program.

2
doc/emacs/help.texi
View file

@ -519,7 +519,7 @@ backward. It also provides a few special commands:
@table @kbd @table @kbd
@item @key{RET} @item @key{RET}
Follow a cross reference at point (@code{help-follow}). Follow a cross-reference at point (@code{help-follow}).
@item @key{TAB} @item @key{TAB}
Move point forward to the next hyperlink (@code{forward-button}). Move point forward to the next hyperlink (@code{forward-button}).
@item S-@key{TAB} @item S-@key{TAB}

2
doc/emacs/text.texi
View file

@ -1944,7 +1944,7 @@ files needed by @TeX{} for cross-references; these commands are generally
not suitable for running the final copy in which all of the cross-references not suitable for running the final copy in which all of the cross-references
need to be correct. need to be correct.
When you want the auxiliary files for cross references, use @kbd{C-c When you want the auxiliary files for cross-references, use @kbd{C-c
C-f} (@code{tex-file}) which runs @TeX{} on the current buffer's file, C-f} (@code{tex-file}) which runs @TeX{} on the current buffer's file,
in that file's directory. Before running @TeX{}, it offers to save any in that file's directory. Before running @TeX{}, it offers to save any
modified buffers. Generally, you need to use (@code{tex-file}) twice to modified buffers. Generally, you need to use (@code{tex-file}) twice to

16
doc/lispref/files.texi
View file

@ -3624,10 +3624,18 @@ ensure this principle is valid.
@var{identification} specifies which part of the identifier shall be @var{identification} specifies which part of the identifier shall be
returned as string. @var{identification} can be the symbol returned as string. @var{identification} can be the symbol
@code{method}, @code{user} or @code{host}; any other value is handled @code{method}, @code{user}, @code{host} or @code{localname}; any other
like @code{nil} and means to return the complete identifier string. value is handled like @code{nil} and means to return the complete
In the example above, the remote @code{user} identifier string would identifier string. In the example above, the remote @code{user}
be @code{root}. identifier string would be @code{root}.
If the remote @var{file} does not contain a method, a user name, or a
host name, the respective default value is returned. The string
returned for @var{identification} @code{localname} can differ depending
on whether there is an existing connection. File name handler specific
implementations could support further @var{identification} symbols;
@xref{Top, Tramp, Tramp, tramp}, for example, knows also the @code{hop}
symbol.
If @var{connected} is non-@code{nil}, this function returns @code{nil} If @var{connected} is non-@code{nil}, this function returns @code{nil}
even if @var{filename} is remote, if Emacs has no network connection even if @var{filename} is remote, if Emacs has no network connection

2
doc/lispref/frames.texi
View file

@ -4678,7 +4678,7 @@ A unibyte string containing data in a certain MIME type.
@end table @end table
@end defvar @end defvar
A call to @code{gui-get-selection} generally returns the the data A call to @code{gui-get-selection} generally returns the data
named @var{data-type} within the selection message, albeit with named @var{data-type} within the selection message, albeit with
@var{data-type} replaced by an alternative name should it be one of @var{data-type} replaced by an alternative name should it be one of
the following X selection targets: the following X selection targets:

2
doc/lispref/package.texi
View file

@ -250,7 +250,7 @@ is the brief description.
Each element in this list should have the form @code{(@var{dep-name} Each element in this list should have the form @code{(@var{dep-name}
@var{dep-version})}, where @var{dep-name} is a symbol whose name is the @var{dep-version})}, where @var{dep-name} is a symbol whose name is the
dependency's package name, and @var{dep-version} is the dependency's dependency's package name, and @var{dep-version} is the dependency's
version (a string). The spacial value @samp{emacs} means that the version (a string). The special value @samp{emacs} means that the
package depends on the given version of Emacs. package depends on the given version of Emacs.
@end defun @end defun

2
doc/lispref/text.texi
View file

@ -6009,7 +6009,7 @@ This API has mandatory and optional parts.
To allow its users to initiate JSONRPC contacts (notifications or To allow its users to initiate JSONRPC contacts (notifications or
requests) or reply to endpoint requests, the new transport requests) or reply to endpoint requests, the new transport
implementation must equip the @code{jsonrpc-connection-send} generic implementation must equip the @code{jsonrpc-connection-send} generic
function with a specialization for the the new subclass function with a specialization for the new subclass
(@pxref{Generic Functions}). This generic function is called (@pxref{Generic Functions}). This generic function is called
automatically by primitives such as @code{jsonrpc-request} and automatically by primitives such as @code{jsonrpc-request} and
@code{jsonrpc-notify}. The specialization should ensure that the @code{jsonrpc-notify}. The specialization should ensure that the

10
doc/man/emacs.1.in
View file

@ -1,5 +1,5 @@
.\" See section COPYING for copyright and redistribution information. .\" See section COPYING for copyright and redistribution information.
.TH EMACS 1 "2022-06-07" "GNU Emacs @version@" "GNU" .TH EMACS 1 "2024-07-18" "GNU Emacs @version@" "GNU"
. .
. .
.SH NAME .SH NAME
@ -115,7 +115,7 @@ This is useful for debugging problems in the init file.
.BI \-u " user\fR,\fP " \-\-user= "user" .BI \-u " user\fR,\fP " \-\-user= "user"
Load Load
.IR user 's .IR user 's
init file. init file instead of your own.
.TP .TP
.BI \-\-init\-directory= "directory" .BI \-\-init\-directory= "directory"
Start emacs with user-emacs-directory set to Start emacs with user-emacs-directory set to
@ -144,7 +144,7 @@ Display
version information and exit. version information and exit.
.TP .TP
.B \-\-help .B \-\-help
Display this help and exit. Display help and exit.
.RE .RE
.PP .PP
The following options are Lisp-oriented The following options are Lisp-oriented
@ -664,7 +664,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual.
. .
. .
.SH COPYING .SH COPYING
Copyright 1995, 1999-2024 Free Software Foundation, Inc. Copyright 1995-2024 Free Software Foundation, Inc.
.PP .PP
Permission is granted to make and distribute verbatim copies of this Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are document provided the copyright notice and this permission notice are
@ -679,6 +679,8 @@ Permission is granted to copy and distribute translations of this
document into another language, under the above conditions for document into another language, under the above conditions for
modified versions, except that this permission notice may be stated modified versions, except that this permission notice may be stated
in a translation approved by the Free Software Foundation. in a translation approved by the Free Software Foundation.
.PP
There is NO WARRANTY, to the extent permitted by law.
. .
.\" Local Variables: .\" Local Variables:

5
doc/misc/ChangeLog.1
View file

@ -343,9 +343,8 @@
2014-06-22 Mario Lang <mlang@delysid.org> 2014-06-22 Mario Lang <mlang@delysid.org>
* srecode.texi (Base Arguments): The the -> to the. * srecode.texi (Base Arguments):
* org.texi (Images in ODT export): Fix typos.
* org.texi (Images in ODT export): The the -> the.
2014-06-21 Eli Zaretskii <eliz@gnu.org> 2014-06-21 Eli Zaretskii <eliz@gnu.org>

4
doc/misc/eshell.texi
View file

@ -2833,12 +2833,12 @@ An implementation of @command{expr} using the Calc package.
@cmindex ff @cmindex ff
@item ff @var{directory} @var{pattern} @item ff @var{directory} @var{pattern}
Shorthand for the the function @code{find-name-dired} (@pxref{Dired Shorthand for the function @code{find-name-dired} (@pxref{Dired
and Find, , , emacs, The Emacs Editor}). and Find, , , emacs, The Emacs Editor}).
@cmindex gf @cmindex gf
@item gf @var{directory} @var{regexp} @item gf @var{directory} @var{regexp}
Shorthand for the the function @code{find-grep-dired} (@pxref{Dired Shorthand for the function @code{find-grep-dired} (@pxref{Dired
and Find, , , emacs, The Emacs Editor}). and Find, , , emacs, The Emacs Editor}).
@cmindex intersection @cmindex intersection

2
doc/misc/gnus.texi
View file

@ -11513,7 +11513,7 @@ even with @sc{xover} by registering the @code{Xref} lines of all
articles you actually read, but if you kill the articles, or just mark articles you actually read, but if you kill the articles, or just mark
them as read without reading them, Gnus will not get a chance to snoop them as read without reading them, Gnus will not get a chance to snoop
the @code{Xref} lines out of these articles, and will be unable to use the @code{Xref} lines out of these articles, and will be unable to use
the cross reference mechanism. the cross-reference mechanism.
@cindex LIST overview.fmt @cindex LIST overview.fmt
@cindex overview.fmt @cindex overview.fmt

2
doc/misc/htmlfontify.texi
View file

@ -751,7 +751,7 @@ should do this.
(hfy-face-to-css @var{fn}) (hfy-face-to-css @var{fn})
@end lisp @end lisp
Take @var{fn}, a font or @code{defface} specification (c.f. Take @var{fn}, a font or @code{defface} specification (cf.
@code{face-attr-construct}) and return a CSS style specification. @code{face-attr-construct}) and return a CSS style specification.
See also: @ref{hfy-face-to-style} See also: @ref{hfy-face-to-style}

2
doc/misc/modus-themes.org
View file

@ -3638,7 +3638,7 @@ Add this to the `modus-themes-post-load-hook'."
The above will work only for themes that belong to the Modus family. The above will work only for themes that belong to the Modus family.
For users of Emacs version 29 or higher, there exists a theme-agnostic For users of Emacs version 29 or higher, there exists a theme-agnostic
hook that takes a function with one argument---that of the theme---and hook that takes a function with one argument---that of the theme---and
calls in the the "post enable" phase of theme loading. Here is the calls in the "post enable" phase of theme loading. Here is the
above snippet, with the necessary tweaks: above snippet, with the necessary tweaks:
#+begin_src emacs-lisp #+begin_src emacs-lisp

2
doc/misc/org.org
View file

@ -11766,7 +11766,7 @@ example
: ./img/cat.jpg : ./img/cat.jpg
If you wish to define a caption for the image (see [[*Captions]]) and If you wish to define a caption for the image (see [[*Captions]]) and
maybe a label for internal cross references (see [[*Internal Links]]), maybe a label for internal cross-references (see [[*Internal Links]]),
make sure that the link is on a line by itself and precede it with make sure that the link is on a line by itself and precede it with
=CAPTION= and =NAME= keywords as follows: =CAPTION= and =NAME= keywords as follows:

2
doc/misc/reftex.texi
View file

@ -4823,7 +4823,7 @@ Macros which can be used for the display of cross references.
This is used when @code{reftex-view-crossref} is called with point in an This is used when @code{reftex-view-crossref} is called with point in an
argument of a macro. Note that crossref viewing for citations, argument of a macro. Note that crossref viewing for citations,
references (both ways) and index entries is hard-coded. This variable references (both ways) and index entries is hard-coded. This variable
is only to configure additional structures for which crossreference is only to configure additional structures for which cross-reference
viewing can be useful. Each entry has the structure viewing can be useful. Each entry has the structure
@example @example
(@var{macro-re} @var{search-re} @var{highlight}). (@var{macro-re} @var{search-re} @var{highlight}).

2
doc/misc/semantic.texi
View file

@ -372,7 +372,7 @@ Infrastructure for searching groups @semantic{} databases, and dealing
with the search results format. with the search results format.
@item semantic/db-ref.el @item semantic/db-ref.el
Tracks crossreferences. Cross references are needed when buffer is Tracks cross-references. Cross-references are needed when buffer is
reparsed, and must alert other tables that any dependent caches may reparsed, and must alert other tables that any dependent caches may
need to be flushed. References are in the form of include files. need to be flushed. References are in the form of include files.

2
etc/ChangeLog.1
View file

@ -1579,7 +1579,7 @@
2011-05-10 Jim Meyering <meyering@redhat.com> 2011-05-10 Jim Meyering <meyering@redhat.com>
* MH-E-NEWS, PROBLEMS: Fix typo "the the -> the". * MH-E-NEWS, PROBLEMS: Fix typo.
2011-05-03 Leo Liu <sdl.web@gmail.com> 2011-05-03 Leo Liu <sdl.web@gmail.com>

2
etc/NEWS.1-17
View file

@ -1355,7 +1355,7 @@ This is because -batch (see above) is now used in building Emacs.
There are probably some Mocklisp constructs that are not handled. There are probably some Mocklisp constructs that are not handled.
If you encounter one, feel free to report the failure as a bug. If you encounter one, feel free to report the failure as a bug.
The construct will be handled in a future Emacs release, if that is not The construct will be handled in a future Emacs release, if that is not
not too hard to do. too hard to do.
Note that lisp code converted from Mocklisp code will not necessarily Note that lisp code converted from Mocklisp code will not necessarily
run as fast as code specifically written for GNU Emacs, nor will it use run as fast as code specifically written for GNU Emacs, nor will it use

2
etc/NEWS.19
View file

@ -2112,7 +2112,7 @@ deletion) now accept a prefix argument which serves as a repeat count.
*** Reference keys can now be entered with TAB completion. All *** Reference keys can now be entered with TAB completion. All
reference keys defined in that buffer and all labels that appear in reference keys defined in that buffer and all labels that appear in
crossreference entries are object to completion. cross-reference entries are object to completion.
*** Braces are supported as field delimiters in addition to quotes. *** Braces are supported as field delimiters in addition to quotes.
BibTeX entries may have brace-delimited and quote-delimited fields BibTeX entries may have brace-delimited and quote-delimited fields

2
etc/NEWS.30
View file

@ -436,7 +436,7 @@ the signature) the automatically inferred function type as well.
*** 'describe-function' now shows the type of the function object. *** 'describe-function' now shows the type of the function object.
The text used to say things like "car is a built-in function" whereas it The text used to say things like "car is a built-in function" whereas it
now says "car is a primitive-function" where "primitive-function" is the now says "car is a primitive-function" where "primitive-function" is the
the name of the symbol returned by 'cl-type-of'. You can click on those name of the symbol returned by 'cl-type-of'. You can click on those
words to get information about that type. words to get information about that type.
--- ---

4
etc/ORG-NEWS
View file

@ -560,7 +560,7 @@ The old name is obsolete.
** New and changed options ** New and changed options
# Chanes deadling with changing default values of customizations, # Changes dealing with changing default values of customizations,
# adding new customizations, or changing the interpretation of the # adding new customizations, or changing the interpretation of the
# existing customizations. # existing customizations.
@ -623,7 +623,7 @@ This new hook runs when a note has been stored.
Sorting of agenda items, tables, menus, headlines, etc can now be Sorting of agenda items, tables, menus, headlines, etc can now be
controlled using a new custom option ~org-sort-function~. controlled using a new custom option ~org-sort-function~.
By default, Org mode sorts things according to the operation system By default, Org mode sorts things according to the operating system
language. However, language sorting rules may or may not produce good language. However, language sorting rules may or may not produce good
results depending on the use case. For example, multi-language results depending on the use case. For example, multi-language
documents may be sorted weirdly when sorting rules for system language documents may be sorted weirdly when sorting rules for system language

2
etc/PROBLEMS
View file

@ -757,7 +757,7 @@ window sizes" (Lisp value 'ignore').
This can happen if your Emacs is configured to convert PDF to SVG for This can happen if your Emacs is configured to convert PDF to SVG for
display, and the version of the MuPDF package you have installed has a display, and the version of the MuPDF package you have installed has a
a known bug, whereby it sometimes produces invalid SVG images. known bug, whereby it sometimes produces invalid SVG images.
Version 1.21 of MuPDF is known to be affected. Version 1.21 of MuPDF is known to be affected.
The solution is either to upgrade or downgrade to a version of MuPDF The solution is either to upgrade or downgrade to a version of MuPDF

21
etc/TODO
View file

@ -72,10 +72,10 @@ Convert those to use it.
** Remove unnecessary autoload cookies from defcustoms ** Remove unnecessary autoload cookies from defcustoms
This needs a bit of care, since often people have become used to This needs a bit of care, since often people have become used to
expecting such variables to always be defined, eg when they modify expecting such variables to always be defined, for example when they
things in their .emacs. modify things in their .emacs.
** See if other files can use generated-autoload-file (see eg ps-print) ** See if other files can use generated-autoload-file (see e.g. ps-print)
** Do interactive mode tagging for commands ** Do interactive mode tagging for commands
Change "(interactive)" to "(interactive nil foo-mode)" for command Change "(interactive)" to "(interactive nil foo-mode)" for command
@ -482,7 +482,7 @@ LSP), see the thread starting at
https://lists.gnu.org/archive/html/emacs-devel/2023-09/msg00609.html https://lists.gnu.org/archive/html/emacs-devel/2023-09/msg00609.html
** FFI (foreign function interface) ** FFI (foreign function interface)
See eg https://lists.gnu.org/r/emacs-devel/2013-10/msg00246.html See e.g. https://lists.gnu.org/r/emacs-devel/2013-10/msg00246.html
One way of doing this is to start with fx's dynamic loading, and use it One way of doing this is to start with fx's dynamic loading, and use it
to implement things like auto-loaded buffer parsers and database to implement things like auto-loaded buffer parsers and database
@ -612,7 +612,7 @@ Ideally from someone familiar with GNUstep and Objective C.
** A more modern printing interface ** A more modern printing interface
A UI that pops up a dialog that lets you choose printer, page style, A UI that pops up a dialog that lets you choose printer, page style,
etc. Integration with the Gtk print dialog is apparently difficult. etc. Integration with the Gtk print dialog is apparently difficult.
See eg: https://lists.gnu.org/r/emacs-devel/2009-03/msg00501.html See e.g.: https://lists.gnu.org/r/emacs-devel/2009-03/msg00501.html
https://lists.gnu.org/r/emacs-devel/2009-04/msg00034.html https://lists.gnu.org/r/emacs-devel/2009-04/msg00034.html
** Allow frames(terminals) created by emacsclient to inherit their environment ** Allow frames(terminals) created by emacsclient to inherit their environment
@ -727,11 +727,6 @@ bar. In the mean time, it should process other messages.
** Get some major packages installed ** Get some major packages installed
*** Magit
This needs work on getting the relevant copyright assignments. This
task should be highly doable for anyone, but will likely require some
patience. See <https://debbugs.gnu.org/72127>.
*** PSGML, _possibly_ ECB *** PSGML, _possibly_ ECB
https://lists.gnu.org/r/emacs-devel/2007-05/msg01493.html Check the https://lists.gnu.org/r/emacs-devel/2007-05/msg01493.html Check the
assignments file for other packages which might go in and have been assignments file for other packages which might go in and have been
@ -752,8 +747,8 @@ them.
Zlib is required for PNG, so may be linked anyhow. Zlib is required for PNG, so may be linked anyhow.
** Improve the GC ** Improve the GC
Introduce generational or incremental GC. We may be able to use the Introduce generational or incremental GC. (We may be able to use the
Boehm collector.) See the Boehm-GC branch in CVS for work on this. Boehm collector.) See the Boehm-GC branch in Git for work on this.
** Check what hooks would help Emacspeak ** Check what hooks would help Emacspeak
See the defadvising in W3. See the defadvising in W3.
@ -1067,7 +1062,7 @@ Anders Lindgren <andlind@gmail.com> has implemented some (very basic)
tests for full screen, toolbar, and auto-hiding the menu bar. tests for full screen, toolbar, and auto-hiding the menu bar.
**** Make sure all build variants work **** Make sure all build variants work
Emacs can be build in a number of different ways. For each feature, Emacs can be built in a number of different ways. For each feature,
consider if is really is "NS" specific, or if it should be applied to consider if is really is "NS" specific, or if it should be applied to
all build versions. all build versions.

2
java/org/gnu/emacs/EmacsSdk7FontDriver.java
View file

@ -354,7 +354,7 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver
rightwards from the origin to the left most pixel in the glyph rightwards from the origin to the left most pixel in the glyph
raster. rbearing is the distance between the origin and the raster. rbearing is the distance between the origin and the
rightmost pixel in the glyph raster. ascent is the distance rightmost pixel in the glyph raster. ascent is the distance
counting upwards between the the topmost pixel in the glyph counting upwards between the topmost pixel in the glyph
raster. descent is the distance (once again counting raster. descent is the distance (once again counting
downwards) between the origin and the bottommost pixel in the downwards) between the origin and the bottommost pixel in the
glyph raster. glyph raster.

2
lisp/ChangeLog.12
View file

@ -15827,7 +15827,7 @@
* progmodes/cc-cmds.el (c-hungry-delete): New function to fix * progmodes/cc-cmds.el (c-hungry-delete): New function to fix
<delete> key behavior in XEmacs according to `delete-forward-p'. <delete> key behavior in XEmacs according to `delete-forward-p'.
C.f. `c-electric-delete'. Cf. `c-electric-delete'.
2005-12-08 Alan Mackenzie <acm@muc.de> 2005-12-08 Alan Mackenzie <acm@muc.de>

2
lisp/ChangeLog.17
View file

@ -8915,7 +8915,7 @@
Return the previous char. Return the previous char.
(perl-calculate-indent): Use syntax-ppss instead of parse-start (perl-calculate-indent): Use syntax-ppss instead of parse-start
and update callers accordingly. For continuation lines, check the and update callers accordingly. For continuation lines, check the
the case of array hashes. case of array hashes.
(perl-backward-to-noncomment): Make it non-interactive. (perl-backward-to-noncomment): Make it non-interactive.
(perl-backward-to-start-of-continued-exp): Rewrite. (perl-backward-to-start-of-continued-exp): Rewrite.

4
lisp/ChangeLog.5
View file

@ -4622,7 +4622,7 @@
(assoc-string-equalp): Renamed to assoc-ignore-case. (assoc-string-equalp): Renamed to assoc-ignore-case.
(bibtex-entry): Reference key can be entered with completion. All (bibtex-entry): Reference key can be entered with completion. All
reference keys that are defined in buffer and all labels that reference keys that are defined in buffer and all labels that
appear in crossreference entries are object to completion. appear in cross-reference entries are object to completion.
(Entry types): Changed order of entries in menu "entry types". (Entry types): Changed order of entries in menu "entry types".
(bibtex-entry-field-alist): Changed order of entries slightly to (bibtex-entry-field-alist): Changed order of entries slightly to
be more conform with standard BibTeX style layouts. be more conform with standard BibTeX style layouts.
@ -4667,7 +4667,7 @@
t) are necessary again. bibtex-clean-entry complains if they are t) are necessary again. bibtex-clean-entry complains if they are
empty but not if they are missing, so you can intentionally omit empty but not if they are missing, so you can intentionally omit
them, e. g. for a pseudo @Journal entry (needed for them, e. g. for a pseudo @Journal entry (needed for
crossreferences) made out of an @article with missing non-optional cross-references) made out of an @article with missing non-optional
fields. fields.
Menu bar entries aren't centered anymore. Menu bar entries aren't centered anymore.

2
lisp/ChangeLog.6
View file

@ -1572,7 +1572,7 @@
newlines. newlines.
(gomoku-init-display): Once again fairly fast due to minimization of (gomoku-init-display): Once again fairly fast due to minimization of
characters in buffer and text-property operations. Cursor cannot be characters in buffer and text-property operations. Cursor cannot be
be off a square. off a square.
(gomoku-display-statistics): Simplified equivalently. (gomoku-display-statistics): Simplified equivalently.
(gomoku-winning-qtuple-beg, gomoku-winning-qtuple-end) (gomoku-winning-qtuple-beg, gomoku-winning-qtuple-end)
(gomoku-winning-qtuple-dx, gomoku-winning-qtuple-dy): Pseudo variables (gomoku-winning-qtuple-dx, gomoku-winning-qtuple-dy): Pseudo variables

13
lisp/allout-widgets.el
View file

@ -115,7 +115,7 @@ inhibition of `allout-widgets-mode'."
;;;_ > allout-widgets-setup (varname value) ;;;_ > allout-widgets-setup (varname value)
;;;###autoload ;;;###autoload
(defun allout-widgets-setup (varname value) (defun allout-widgets-setup (varname value)
"Commission or decommission allout-widgets-mode along with allout-mode. "Commission or decommission `allout-widgets-mode' along with `allout-mode'.
Meant to be used by customization of `allout-widgets-auto-activation'." Meant to be used by customization of `allout-widgets-auto-activation'."
(set-default varname value) (set-default varname value)
@ -254,7 +254,8 @@ or deleted while this variable is nil.")
(defun allout-widgets-tally-string () (defun allout-widgets-tally-string ()
"Return a string with number of tracked widgets, or empty string if not tracking. "Return a string with number of tracked widgets, or empty string if not tracking.
The string is formed for appending to the allout-mode mode-line lighter. The string is formed for appending to the `allout-mode' mode-line
lighter.
An empty string is also returned if tracking is inhibited or An empty string is also returned if tracking is inhibited or
widgets are locally inhibited. widgets are locally inhibited.
@ -303,9 +304,9 @@ You can use this as a file local variable setting to disable
allout widgets enhancements in selected buffers while generally allout widgets enhancements in selected buffers while generally
enabling widgets by customizing `allout-widgets-auto-activation'. enabling widgets by customizing `allout-widgets-auto-activation'.
In addition, you can invoked `allout-widgets-mode' allout-mode In addition, you can invoke `allout-widgets-mode' in `allout-mode'
buffers where this is set to enable and disable widget buffers where this is set to enable and disable widget enhancements,
enhancements, directly.") directly.")
;;;###autoload ;;;###autoload
(put 'allout-widgets-mode-inhibit 'safe-local-variable #'booleanp) (put 'allout-widgets-mode-inhibit 'safe-local-variable #'booleanp)
;;;_ = allout-inhibit-body-modification-hook ;;;_ = allout-inhibit-body-modification-hook
@ -862,7 +863,7 @@ Optional RECURSING is for internal use, to limit recursion."
We store a backtrace of the error information in the variable, We store a backtrace of the error information in the variable,
`allout-widgets-last-hook-error', unset the error handlers, and `allout-widgets-last-hook-error', unset the error handlers, and
reraise the error, so that processing continues to the reraise the error, so that processing continues to the
encompassing condition-case." encompassing `condition-case'."
;; first deconstruct special error environment so errors here propagate ;; first deconstruct special error environment so errors here propagate
;; to encompassing condition-case: ;; to encompassing condition-case:
(setq debugger 'debug (setq debugger 'debug

2
lisp/calc/calc-funcs.el
View file

@ -897,7 +897,7 @@
;;; Bn = n! bn ;;; Bn = n! bn
;;; bn = - sum_k=0^n-1 bk / (n-k+1)! ;;; bn = - sum_k=0^n-1 bk / (n-k+1)!
;;; A faster method would be to use "tangent numbers", c.f., Concrete ;;; A faster method would be to use "tangent numbers", cf., Concrete
;;; Mathematics pg. 273. ;;; Mathematics pg. 273.

2
lisp/cedet/srecode/fields.el
View file

@ -70,7 +70,7 @@ Once an insertion set is done, these fields will be activated.")
(defclass srecode-overlaid () (defclass srecode-overlaid ()
((overlay :documentation ((overlay :documentation
"Overlay representing this field. "Overlay representing this field.
The overlay will crossreference this object.") The overlay will cross-reference this object.")
) )
"An object that gets automatically bound to an overlay. "An object that gets automatically bound to an overlay.
Has virtual :start and :end initializers.") Has virtual :start and :end initializers.")

2
lisp/completion.el
View file

@ -65,7 +65,7 @@
;;--------------------- ;;---------------------
;; ;;
;; A "word" is any string containing characters with either word or symbol ;; A "word" is any string containing characters with either word or symbol
;; syntax. [E.G. Any alphanumeric string with hyphens, underscores, etc.] ;; syntax. [E.g., any alphanumeric string with hyphens, underscores, etc.]
;; Unless you change the constants, you must type at least three characters ;; Unless you change the constants, you must type at least three characters
;; for the word to be recognized. Only words longer than 6 characters are ;; for the word to be recognized. Only words longer than 6 characters are
;; saved. ;; saved.

2
lisp/emacs-lisp/byte-run.el
View file

@ -334,7 +334,7 @@ This is used by `declare'.")
(f (apply (car f) name arglist (cdr x))) (f (apply (car f) name arglist (cdr x)))
;; Yuck!! ;; Yuck!!
((and (featurep 'cl) ((and (featurep 'cl)
(memq (car x) ;C.f. cl--do-proclaim. (memq (car x) ;Cf. cl--do-proclaim.
'(special inline notinline optimize warn))) '(special inline notinline optimize warn)))
(push (list 'declare x) cl-decls) (push (list 'declare x) cl-decls)
nil) nil)

2
lisp/emulation/cua-base.el
View file

@ -133,7 +133,7 @@
;; Emacs's normal rectangle support is based on interpreting the region ;; Emacs's normal rectangle support is based on interpreting the region
;; between the mark and point as a "virtual rectangle", and using a ;; between the mark and point as a "virtual rectangle", and using a
;; completely separate set of "rectangle commands" [C-x r ...] on the ;; completely separate set of "rectangle commands" [C-x r ...] on the
;; region to copy, kill, fill a.s.o. the virtual rectangle. ;; region to copy, kill, fill, and so on the virtual rectangle.
;; ;;
;; cua-mode's superior rectangle support uses a true visual ;; cua-mode's superior rectangle support uses a true visual
;; representation of the selected rectangle, i.e. it highlights the ;; representation of the selected rectangle, i.e. it highlights the

11
lisp/files.el
View file

@ -1298,9 +1298,14 @@ any that are missing.
IDENTIFICATION can specify which part of the identification to IDENTIFICATION can specify which part of the identification to
return. IDENTIFICATION can be the symbol `method', `user', return. IDENTIFICATION can be the symbol `method', `user',
`host', or `localname'. Any other value is handled like nil and `host', or `localname'. Any other value is handled like nil and
means to return the complete identification. The string returned means to return the complete identification.
for IDENTIFICATION `localname' can differ depending on whether
there is an existing connection. If the remote FILE does not contain a method, a user name, or a host
name, the respective default value is returned. The string returned for
IDENTIFICATION `localname' can differ depending on whether there is an
existing connection. File name handler specific implementations could
support further IDENTIFICATION symbols; Tramp, for example, knows also
the `hop' symbol.
If CONNECTED is non-nil, return an identification only if FILE is If CONNECTED is non-nil, return an identification only if FILE is
located on a remote system and a connection is established to located on a remote system and a connection is established to

4
lisp/foldout.el
View file

@ -44,7 +44,7 @@
;; ;;
;; When zooming in on a heading you might only want to see the child ;; When zooming in on a heading you might only want to see the child
;; subheadings. You do this by specifying a numeric argument: C-u C-c C-z. ;; subheadings. You do this by specifying a numeric argument: C-u C-c C-z.
;; You can specify the number of levels of children too (c.f. show-children): ;; You can specify the number of levels of children too (cf. `show-children'):
;; e.g. M-2 C-c C-z exposes two levels of child subheadings. Alternatively, ;; e.g. M-2 C-c C-z exposes two levels of child subheadings. Alternatively,
;; you might only be interested in the body. You do this by specifying a ;; you might only be interested in the body. You do this by specifying a
;; negative argument: M-- C-c C-z. You can also cause the whole subtree to be ;; negative argument: M-- C-c C-z. You can also cause the whole subtree to be
@ -239,7 +239,7 @@ An end marker of nil means the fold ends after (point-max).")
Normally the body and the immediate subheadings are exposed, but Normally the body and the immediate subheadings are exposed, but
optional arg EXPOSURE \(interactively with prefix arg) changes this:- optional arg EXPOSURE \(interactively with prefix arg) changes this:-
EXPOSURE > 0 exposes n levels of subheadings (c.f. `show-children') EXPOSURE > 0 exposes n levels of subheadings (cf. `show-children')
EXPOSURE < 0 exposes only the body EXPOSURE < 0 exposes only the body
EXPOSURE = 0 exposes the entire subtree" EXPOSURE = 0 exposes the entire subtree"
(interactive "P") (interactive "P")

2
lisp/international/mule-conf.el
View file

@ -709,7 +709,7 @@
;; Original name for cp1125, says Serhii Hlodin <hlodin@lutsk.bank.gov.ua> ;; Original name for cp1125, says Serhii Hlodin <hlodin@lutsk.bank.gov.ua>
(define-charset-alias 'cp866u 'cp1125) (define-charset-alias 'cp866u 'cp1125)
;; Fixme: C.f. iconv, https://czyborra.com/charsets/codepages.html ;; FIXME: Cf. iconv, https://czyborra.com/charsets/codepages.html
;; shows this as not ASCII compatible, with various graphics in ;; shows this as not ASCII compatible, with various graphics in
;; 0x01-0x1F. ;; 0x01-0x1F.
(define-charset 'cp437 (define-charset 'cp437

4
lisp/language/cyrillic.el
View file

@ -36,8 +36,8 @@
;; <URL:https://czyborra.com/charsets/cyrillic.html>. ;; <URL:https://czyborra.com/charsets/cyrillic.html>.
;; Note that 8859-5 maps directly onto the Unicode Cyrillic block, ;; Note that 8859-5 maps directly onto the Unicode Cyrillic block,
;; apart from codepoints 160 (NBSP, c.f. U+0400), 173 (soft hyphen, ;; apart from codepoints 160 (NBSP, cf. U+0400), 173 (soft hyphen,
;; c.f. U+04OD) and 253 (section sign, c.f U+045D). The KOI-8 and ;; cf. U+04OD) and 253 (section sign, cf. U+045D). The KOI-8 and
;; Alternativnyj coding systems encode both 8859-5 and Unicode. ;; Alternativnyj coding systems encode both 8859-5 and Unicode.
;;; Code: ;;; Code:

5
lisp/org/ChangeLog.1
View file

@ -654,9 +654,8 @@
2014-06-22 Mario Lang <mlang@delysid.org> 2014-06-22 Mario Lang <mlang@delysid.org>
* org-list.el (org-list-insert-item): The the -> the. * org-list.el (org-list-insert-item):
* org-bibtex.el (org-bibtex-fields): Fix typos.
* org-bibtex.el (org-bibtex-fields): The the -> the.
2013-06-22 Dmitry Antipov <dmantipov@yandex.ru> 2013-06-22 Dmitry Antipov <dmantipov@yandex.ru>

2
lisp/org/org-agenda.el
View file

@ -2230,7 +2230,7 @@ This is an internal flag indicating either temporary or extended
agenda restriction. Specifically, it is set to t if the agenda agenda restriction. Specifically, it is set to t if the agenda
is restricted to an entire file, and is set to the corresponding is restricted to an entire file, and is set to the corresponding
buffer if the agenda is restricted to a part of a file, e.g. a buffer if the agenda is restricted to a part of a file, e.g. a
region or a substree. In the latter case, region or a subtree. In the latter case,
`org-agenda-restrict-begin' and `org-agenda-restrict-end' are set `org-agenda-restrict-begin' and `org-agenda-restrict-end' are set
to the beginning and the end of the part. to the beginning and the end of the part.

2
lisp/org/org-element.el
View file

@ -7981,7 +7981,7 @@ the cache."
(unless (memq granularity '( headline headline+inlinetask (unless (memq granularity '( headline headline+inlinetask
greater-element element)) greater-element element))
(error "Unsupported granularity: %S" granularity)) (error "Unsupported granularity: %S" granularity))
;; Make TO-POS marker. Otherwise, buffer edits may garble the the ;; Make TO-POS marker. Otherwise, buffer edits may garble the
;; process. ;; process.
(unless (markerp to-pos) (unless (markerp to-pos)
(let ((mk (make-marker))) (let ((mk (make-marker)))

2
lisp/org/org-fold-core.el
View file

@ -172,7 +172,7 @@
;; The isearch behavior is controlled on per-folding-spec basis by ;; The isearch behavior is controlled on per-folding-spec basis by
;; setting `isearch-open' and `isearch-ignore' folding spec ;; setting `isearch-open' and `isearch-ignore' folding spec
;; properties. The the docstring of `org-fold-core--specs' for more details. ;; properties. See the docstring of `org-fold-core--specs' for more details.
;;; Handling edits inside folded text ;;; Handling edits inside folded text

2
lisp/org/org.el
View file

@ -3796,7 +3796,7 @@ You need to reload Org or to restart Emacs after setting this.")
"Alist of characters and faces to emphasize text. "Alist of characters and faces to emphasize text.
Text starting and ending with a special character will be emphasized, Text starting and ending with a special character will be emphasized,
for example *bold*, _underlined_ and /italic/. This variable sets the for example *bold*, _underlined_ and /italic/. This variable sets the
the face to be used by font-lock for highlighting in Org buffers. face to be used by font-lock for highlighting in Org buffers.
Marker characters must be one of */_=~+. Marker characters must be one of */_=~+.
You need to reload Org or to restart Emacs after customizing this." You need to reload Org or to restart Emacs after customizing this."

2
lisp/progmodes/cc-engine.el
View file

@ -7114,7 +7114,7 @@ comment at the start of cc-engine.el for more info."
"\\(?:\\\\\\(?:.\\|\n\\)\\|[^\"\n\\]\\)*[\"\n]" nil 'stay))) "\\(?:\\\\\\(?:.\\|\n\\)\\|[^\"\n\\]\\)*[\"\n]" nil 'stay)))
((memq lit-type '(c c++)) ((memq lit-type '(c c++))
;; To work around a bug in parse-partial-sexp, where effect is given ;; To work around a bug in parse-partial-sexp, where effect is given
;; to the syntax of a backslash, even the the scan starts with point ;; to the syntax of a backslash, even the scan starts with point
;; just after it. ;; just after it.
(if (and (eq (char-before pt-search) ?\\) (if (and (eq (char-before pt-search) ?\\)
(eq (char-after pt-search) ?\n)) (eq (char-after pt-search) ?\n))

2
lisp/progmodes/peg.el
View file

@ -698,7 +698,7 @@ rulesets defined previously with `define-peg-ruleset'."
(cl-defmethod peg--translate ((_ (eql guard)) exp) exp) (cl-defmethod peg--translate ((_ (eql guard)) exp) exp)
(defvar peg-syntax-classes (defvar peg-syntax-classes
'((whitespace ?-) (word ?w) (symbol ?s) (punctuation ?.) '((whitespace ?-) (word ?w) (symbol ?_) (punctuation ?.)
(open ?\() (close ?\)) (string ?\") (escape ?\\) (charquote ?/) (open ?\() (close ?\)) (string ?\") (escape ?\\) (charquote ?/)
(math ?$) (prefix ?') (comment ?<) (endcomment ?>) (math ?$) (prefix ?') (comment ?<) (endcomment ?>)
(comment-fence ?!) (string-fence ?|))) (comment-fence ?!) (string-fence ?|)))

2
lisp/progmodes/scheme.el
View file

@ -545,7 +545,7 @@ that variable's value is a string."
'("(\\(element\\)\\>[ \t]*(\\(\\S)+\\))" '("(\\(element\\)\\>[ \t]*(\\(\\S)+\\))"
(1 font-lock-keyword-face) (1 font-lock-keyword-face)
(2 font-lock-type-face)) (2 font-lock-type-face))
'("\\<\\sw+:\\>" . font-lock-constant-face) ; trailing `:' c.f. scheme '("\\<\\sw+:\\>" . font-lock-constant-face) ; trailing `:' cf. scheme
;; SGML markup (from sgml-mode) : ;; SGML markup (from sgml-mode) :
'("<\\([!?][-a-z0-9]+\\)" 1 font-lock-keyword-face) '("<\\([!?][-a-z0-9]+\\)" 1 font-lock-keyword-face)
'("<\\(/?[-a-z0-9]+\\)" 1 font-lock-function-name-face))) '("<\\(/?[-a-z0-9]+\\)" 1 font-lock-function-name-face)))

11
lisp/subr.el
View file

@ -1507,7 +1507,7 @@ The normal global definition of the character ESC indirects to this keymap.")
(make-obsolete 'ESC-prefix 'esc-map "28.1") (make-obsolete 'ESC-prefix 'esc-map "28.1")
(defvar ctl-x-4-map (make-sparse-keymap) (defvar ctl-x-4-map (make-sparse-keymap)
"Keymap for subcommands of C-x 4.") "Keymap for subcommands of \\`C-x 4'.")
(defalias 'ctl-x-4-prefix ctl-x-4-map) (defalias 'ctl-x-4-prefix ctl-x-4-map)
(defvar ctl-x-5-map (make-sparse-keymap) (defvar ctl-x-5-map (make-sparse-keymap)
@ -1530,8 +1530,9 @@ The normal global definition of the character ESC indirects to this keymap.")
(define-key map "<" #'scroll-left) (define-key map "<" #'scroll-left)
(define-key map ">" #'scroll-right) (define-key map ">" #'scroll-right)
map) map)
"Default keymap for C-x commands. "Default keymap for \\`C-x' commands.
The normal global definition of the character C-x indirects to this keymap.") The normal global definition of the character \\`C-x' indirects to this
keymap.")
(fset 'Control-X-prefix ctl-x-map) (fset 'Control-X-prefix ctl-x-map)
(make-obsolete 'Control-X-prefix 'ctl-x-map "28.1") (make-obsolete 'Control-X-prefix 'ctl-x-map "28.1")
@ -3380,8 +3381,8 @@ only unbound fallback disabled is downcasing of the last event."
(defvar touch-screen-events-received nil (defvar touch-screen-events-received nil
"Whether a touch screen event has ever been translated. "Whether a touch screen event has ever been translated.
The value of this variable governs whether The value of this variable governs whether `read--potential-mouse-event'
`read--potential-mouse-event' calls read-key or read-event.") calls `read-key' or `read-event'.")
;; FIXME: Once there's a safe way to transition away from read-event, ;; FIXME: Once there's a safe way to transition away from read-event,
;; callers to this function should be updated to that way and this ;; callers to this function should be updated to that way and this

4
lisp/textmodes/reftex-dcr.el
View file

@ -110,7 +110,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
(if (and (eq arg 2) (windowp dw)) (select-window dw))))) (if (and (eq arg 2) (windowp dw)) (select-window dw)))))
(defun reftex-view-cr-cite (arg key how) (defun reftex-view-cr-cite (arg key how)
;; View crossreference of a ref cite. HOW can have the values ;; View cross-reference of a ref cite. HOW can have the values
;; nil: Show in another window. ;; nil: Show in another window.
;; echo: Show one-line info in echo area. ;; echo: Show one-line info in echo area.
;; tmp-window: Show in small window and arrange for window to disappear. ;; tmp-window: Show in small window and arrange for window to disappear.
@ -175,7 +175,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
(select-window pop-win))))) (select-window pop-win)))))
(defun reftex-view-cr-ref (arg label how) (defun reftex-view-cr-ref (arg label how)
;; View crossreference of a ref macro. HOW can have the values ;; View cross-reference of a ref macro. HOW can have the values
;; nil: Show in another window. ;; nil: Show in another window.
;; echo: Show one-line info in echo area. ;; echo: Show one-line info in echo area.
;; tmp-window: Show in small window and arrange for window to disappear. ;; tmp-window: Show in small window and arrange for window to disappear.

6
lisp/touch-screen.el
View file

@ -1490,9 +1490,9 @@ If INTERACTIVE, execute the command associated with any event
generated instead of throwing `input-event'. Otherwise, throw generated instead of throwing `input-event'. Otherwise, throw
`input-event' with a single input event if that event should take `input-event' with a single input event if that event should take
the place of EVENT within the key sequence being translated, or the place of EVENT within the key sequence being translated, or
`nil' if all tools have been released. nil if all tools have been released.
Set `touch-screen-events-received' to `t' to indicate that touch Set `touch-screen-events-received' to t to indicate that touch
screen events have been received, and thus by extension require screen events have been received, and thus by extension require
functions undertaking event management themselves to call functions undertaking event management themselves to call
`read-key' rather than `read-event'." `read-key' rather than `read-event'."
@ -2083,4 +2083,4 @@ Must be called from a command bound to a `touchscreen-hold' or
(provide 'touch-screen) (provide 'touch-screen)
;;; touch-screen ends here ;;; touch-screen.el ends here

11
lisp/transient.el
View file

@ -82,17 +82,6 @@ similar defect.") :emergency))
(defvar Man-notify-method) (defvar Man-notify-method)
(defvar pp-default-function) ; since Emacs 29.1 (defvar pp-default-function) ; since Emacs 29.1
(defmacro static-if (condition then-form &rest else-forms)
"A conditional compilation macro.
Evaluate CONDITION at macro-expansion time. If it is non-nil,
expand the macro to THEN-FORM. Otherwise expand it to ELSE-FORMS
enclosed in a `progn' form. ELSE-FORMS may be empty."
(declare (indent 2)
(debug (sexp sexp &rest sexp)))
(if (eval condition lexical-binding)
then-form
(cons 'progn else-forms)))
(defmacro transient--with-emergency-exit (id &rest body) (defmacro transient--with-emergency-exit (id &rest body)
(declare (indent defun)) (declare (indent defun))
(unless (keywordp id) (unless (keywordp id)

5
lisp/treesit.el
View file

@ -1122,7 +1122,7 @@ and leave settings for other languages unchanged."
(t current-value)))))) (t current-value))))))
(defun treesit-add-font-lock-rules (rules &optional how feature) (defun treesit-add-font-lock-rules (rules &optional how feature)
"Add font-lock RULES to the current buffer "Add font-lock RULES to the current buffer.
RULES should be the return value of `treesit-font-lock-rules'. RULES RULES should be the return value of `treesit-font-lock-rules'. RULES
will be enabled and added to `treesit-font-lock-settings'. will be enabled and added to `treesit-font-lock-settings'.
@ -1413,7 +1413,8 @@ For RANGES and PARSER see `treesit-parser-add-notifier'.
After the parser reparses, we get the changed ranges, and After the parser reparses, we get the changed ranges, and
1) update non-primary parsers' ranges in the changed ranges 1) update non-primary parsers' ranges in the changed ranges
2) mark these ranges as to-be-fontified, 2) mark these ranges as to-be-fontified,
3) tell syntax-ppss to start reparsing from the min point of the ranges. 3) tell `syntax-ppss' to start reparsing from the min point of the
ranges.
We need to mark to-be-fontified ranges before redisplay starts working, We need to mark to-be-fontified ranges before redisplay starts working,
because sometimes the range edited by the user is not the only range because sometimes the range edited by the user is not the only range

2
lisp/winner.el
View file

@ -261,7 +261,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
;; Make sure point does not end up in the minibuffer and delete ;; Make sure point does not end up in the minibuffer and delete
;; windows displaying dead or boring buffers ;; windows displaying dead or boring buffers
;; (c.f. `winner-boring-buffers') and `winner-boring-buffers-regexp'. ;; (cf. `winner-boring-buffers') and `winner-boring-buffers-regexp'.
;; Return nil if all the windows should be deleted. Preserve correct ;; Return nil if all the windows should be deleted. Preserve correct
;; points and marks. ;; points and marks.
(defun winner-set (conf) (defun winner-set (conf)

2
oldXMenu/Internal.c
View file

@ -809,7 +809,7 @@ _XMRecomputeSelection(register Display *display, register XMenu *menu, register
/* /*
* _XMTransToOrigin - Internal subroutine to translate the point at * _XMTransToOrigin - Internal subroutine to translate the point at
* the center of the current pane and selection to the * the center of the current pane and selection to the
* the menu origin. * menu origin.
* *
* WARNING! ****** Be certain that all menu dependencies have been * WARNING! ****** Be certain that all menu dependencies have been
* recomputed before calling this routine or * recomputed before calling this routine or

2
src/ChangeLog.12
View file

@ -19776,7 +19776,7 @@
2011-05-10 Jim Meyering <meyering@redhat.com> 2011-05-10 Jim Meyering <meyering@redhat.com>
* xdisp.c (x_intersect_rectangles): Fix typo "the the -> the". * xdisp.c (x_intersect_rectangles): Fix typo.
2011-05-10 Juanma Barranquero <lekktu@gmail.com> 2011-05-10 Juanma Barranquero <lekktu@gmail.com>

2
src/ChangeLog.13
View file

@ -6250,7 +6250,7 @@
2014-06-22 Mario Lang <mlang@delysid.org> 2014-06-22 Mario Lang <mlang@delysid.org>
* w32fns.c (Fw32_shell_execute): The the -> the. * w32fns.c (Fw32_shell_execute): Fix typo.
2014-06-22 Dmitry Antipov <dmantipov@yandex.ru> 2014-06-22 Dmitry Antipov <dmantipov@yandex.ru>

2
src/ChangeLog.8
View file

@ -8798,7 +8798,7 @@
* dispextern.h (struct glyph_pos): New member dpvec_index. * dispextern.h (struct glyph_pos): New member dpvec_index.
(MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P): Test if row ends in the (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P): Test if row ends in the
the middle of a character. middle of a character.
(MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Test if row starts in (MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Test if row starts in
the middle of a character. the middle of a character.

2
src/android.c
View file

@ -5341,7 +5341,7 @@ android_wc_lookup_string (android_key_pressed_event *event,
characters = (*env)->GetStringChars (env, string, NULL); characters = (*env)->GetStringChars (env, string, NULL);
android_exception_check_nonnull ((void *) characters, string); android_exception_check_nonnull ((void *) characters, string);
/* Establish the size of the the string. */ /* Establish the size of the string. */
size = (*env)->GetStringLength (env, string); size = (*env)->GetStringLength (env, string);
/* Copy over the string data. */ /* Copy over the string data. */

2
src/androidvfs.c
View file

@ -4356,7 +4356,7 @@ android_saf_stat (const char *uri_name, const char *id_name,
return 0; return 0;
} }
/* Detect if Emacs has access to the document designated by the the /* Detect if Emacs has access to the document designated by the
document ID ID_NAME within the tree URI_NAME. If ID_NAME is NULL, document ID ID_NAME within the tree URI_NAME. If ID_NAME is NULL,
use the document ID in URI_NAME itself. use the document ID in URI_NAME itself.

8
src/comp.c
View file

@ -2821,12 +2821,12 @@ emit_static_object (const char *name, Lisp_Object obj)
<https://gcc.gnu.org/ml/jit/2019-q3/msg00013.html>. <https://gcc.gnu.org/ml/jit/2019-q3/msg00013.html>.
Adjust if possible to reduce the number of function calls. */ Adjust if possible to reduce the number of function calls. */
size_t chunck_size = NILP (Fcomp_libgccjit_version ()) ? 200 : 1024; size_t chunk_size = NILP (Fcomp_libgccjit_version ()) ? 200 : 1024;
char *buff = xmalloc (chunck_size); char *buff = xmalloc (chunk_size);
for (ptrdiff_t i = 0; i < len;) for (ptrdiff_t i = 0; i < len;)
{ {
strncpy (buff, p, chunck_size); strncpy (buff, p, chunk_size);
buff[chunck_size - 1] = 0; buff[chunk_size - 1] = 0;
uintptr_t l = strlen (buff); uintptr_t l = strlen (buff);
if (l != 0) if (l != 0)

2
src/pgtkfns.c
View file

@ -1856,7 +1856,7 @@ parse_resource_key (const char *res_key, char *setting_key)
*dp++ = c; *dp++ = c;
sp++; sp++;
} }
*dp++ = '/'; /* must ends with '/' */ *dp++ = '/'; /* must end with '/' */
*dp = '\0'; *dp = '\0';
} }

2
src/sfnt.c
View file

@ -9166,7 +9166,7 @@ sfnt_interpret_alignrp (struct sfnt_interpreter *interpreter)
ZP1. ZP1.
Move both points along the freedom vector by half the magnitude of Move both points along the freedom vector by half the magnitude of
the the projection of a vector formed by P1.x - P2.x, P1.y - P2.y, the projection of a vector formed by P1.x - P2.x, P1.y - P2.y,
upon the projection vector. */ upon the projection vector. */
static void static void

2
src/sfntfont.c
View file

@ -1630,7 +1630,7 @@ sfntfont_registries_compatible_p (Lisp_Object a, Lisp_Object b)
Value is 0 if there is no match, -1 if there is a match against Value is 0 if there is no match, -1 if there is a match against
DESC itself, and the number of matching instances if the style DESC itself, and the number of matching instances if the style
matches one or more instances defined in in DESC. Return the index matches one or more instances defined in DESC. Return the index
of each matching instance in INSTANCES; it should be SIZE big. */ of each matching instance in INSTANCES; it should be SIZE big. */
static int static int

2
src/textconv.h
View file

@ -100,7 +100,7 @@ struct textconv_callback_struct
the end of the conversion. */ the end of the conversion. */
enum textconv_caret_direction direction; enum textconv_caret_direction direction;
/* The the number of times for which to repeat the scanning in order /* The number of times for which to repeat the scanning in order
to determine the starting position of the text to return. */ to determine the starting position of the text to return. */
unsigned short factor; unsigned short factor;

2
src/w32fns.c
View file

@ -11614,7 +11614,7 @@ void
load_unicows_dll_for_w32fns (HMODULE unicows) load_unicows_dll_for_w32fns (HMODULE unicows)
{ {
if (!unicows) if (!unicows)
/* The functions following are defined by SHELL32.DLL onw Windows /* The functions following are defined by SHELL32.DLL on Windows
NT. */ NT. */
unicows = GetModuleHandle ("shell32"); unicows = GetModuleHandle ("shell32");

2
test/lisp/progmodes/cperl-mode-tests.el
View file

@ -1448,7 +1448,7 @@ as a regex."
;; Example 3 and 4 can't be directly tested because jit-lock and ;; Example 3 and 4 can't be directly tested because jit-lock and
;; batch tests don't play together well. But we can approximate ;; batch tests don't play together well. But we can approximate
;; the behavior by calling the the fontification for the same ;; the behavior by calling the fontification for the same
;; region which would be used by jit-lock. ;; region which would be used by jit-lock.
;; Example 3 ;; Example 3
(search-forward "sub do_stuff") (search-forward "sub do_stuff")