procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Merge from origin/emacs-30

Browse source 
88e1ec22f2 Update to Org 9.7.9
1ae2f00447 Fix edge-case with 'which-key-dont-use-unicode' setter
68a5f1f7d1 NS: prevent makeKeyWindow warnings (bug#69525)
59a895ec49 ; * .gitignore: Add lisp/eshell/esh-groups.el.
5c08cd4e7c ; * doc/emacs/cmdargs.texi (Initial Options): Fix last ch...
309d0a7186 Add PROBLEMS entry for bug#72303
87389f9ff9 ; Improve documentation of 'line-prefix' and 'wrap-prefix'.
268a2d10fc Improve documentation of '--init-directory' command-line ...
c27055a938 ; cperl-mode.el: Fix fontification of flip-flop (Bug#72296)
fcd4e4c895 ; * admin/MAINTAINERS: Add myself for maintaining some ar...
fdc133e97f Fix bug in server.el introduced by 0d7d835902
af527051cd ; * admin/MAINTAINERS: Remove Nicolas Petton.
7170282a59 lisp/minibuffer.el (completion--sifn-requote): Fix bug#72176
68906f184c * admin/notes/spelling: Update note.
9eea6be5ab Don't produce invalid XML with multi-line commenting style
b97786d9f6 ; * etc/NEWS: Entry for 'gnus-summary-limit-to-age' (bug#...
a799661566 Standardize possessive apostrophe usage in manuals, docs,...
67faaead75 Don't refer to obsolete finder group "wp"

# Conflicts:
#	etc/NEWS
This commit is contained in:
Eli Zaretskii 2024-07-27 04:27:53 -04:00
commit c3c27a919c
75 changed files with 205 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -131,6 +131,7 @@ lisp/cedet/semantic/wisent/python-wy.el
lisp/cedet/srecode/srt-wy.el
lisp/cedet/semantic/grammar-wy.el
lisp/eshell/esh-module-loaddefs.el
lisp/eshell/esh-groups.el
lisp/finder-inf.el
lisp/leim/ja-dic/
leim/small-ja-dic-option

27
admin/MAINTAINERS
View file

@ -84,14 +84,6 @@ Michael Albinus
Simen Heggestøyl
lisp/textmodes/css-mode.el
Nicolas Petton
lisp/emacs-lisp/map.el
test/lisp/emac-lisp/map-tests.el
lisp/emacs-lisp/seq.el
test/lisp/emac-lisp/seq-tests.el
lisp/emacs-lisp/thunk.el
test/lisp/emac-lisp/thunk-tests.el
The GNU AUCTeX maintainers (auctex-devel@gnu.org)
RefTeX
lisp/textmodes/reftex-auc.el
@ -233,6 +225,10 @@ Jim Porter
test/lisp/eshell/*
doc/misc/eshell.texi
Juri Linkov
lisp/tab-bar.el
lisp/tab-line.el
==============================================================================
2. Areas that someone is willing to maintain, although he would not
necessarily mind if someone else was the official maintainer.
@ -334,10 +330,6 @@ Michael Albinus
doc/misc/auth.texi
test/lisp/auth-source-tests.el
Nicolas Petton
lisp/emacs-lisp/subr-x.el
lisp/arc-mode.el
Tassilo Horn
lisp/doc-view.el
@ -364,6 +356,17 @@ Po Lu
Daniel Pettersson
lisp/jsonrpc.el
Juri Linkov
Isearch and Replace
lisp/isearch.el
lisp/replace.el
lisp/misearch.el
lisp/hi-lock.el
Outline minor mode
lisp/outline.el
Repeat mode
lisp/repeat.el
==============================================================================
3. Externally maintained packages.
==============================================================================

6
admin/notes/spelling
View file

@ -8,4 +8,10 @@ Re "behavior" vs "behaviour", etc.
- It's probably (IMHO --ttn, 2017-10-13) not a high priority to
change existing text; use your best judgment (ask if unsure).
- The admin/run-codespell script treats many non-US spellings as
typos and fixes them. It does not consider Lisp symbols.
- Consider renaming especially commands and user options for
consistency. Leave obsolete aliases, as always.
- https://lists.gnu.org/r/emacs-devel/2005-06/msg00489.html

10
doc/emacs/cmdargs.texi
View file

@ -351,6 +351,16 @@ Do not include the @file{site-lisp} directories in @code{load-path}
@item --init-directory
@opindex --init-directory
Specify the directory to use when looking for the Emacs init files.
Note that this merely overrides the value of
@file{user-emacs-directory}, the directory which Emacs usually
determines as side effect of searching for your init file (@pxref{Find
Init}), but does not change the search for the @file{~/.emacs} init
file. In particular, if there's no @file{init.el} file in the directory
named by this option, Emacs will find and use @file{init.el} it would
have used without this option (but will search for your other per-user
Emacs files in the directory specified by this option). If you want to
force Emacs to use @file{init.el} file in this directory, make sure it
exists there before starting Emacs with this option.
@item --no-splash
@opindex --no-splash

8
doc/emacs/custom.texi
View file

@ -2957,8 +2957,14 @@ Note also that if neither the XDG location nor @file{~/.emacs.d}
exist, then Emacs will create @file{~/.emacs.d} (and therefore use it
during subsequent invocations).
@vindex user-emacs-directory
Emacs will set @code{user-emacs-directory} to the directory it decides
to use.
to use. This directory is subsequently used to look for your other
user-specific Emacs files, such as @code{custom-file} (@pxref{Saving
Customizations}), the saved desktop (@pxref{Saving Emacs Sessions}) and
others. The @code{--init-directory} command-line option (@pxref{Initial
Options}) overrides the value of @code{user-emacs-directory} determined
as side effect of the search for your user init file described above.
Although this is backward-compatible with older Emacs versions, modern
POSIX platforms prefer putting your initialization files under

8
doc/lispref/frames.texi
View file

@ -589,7 +589,7 @@ The @dfn{external border} is part of the decorations supplied by the
window manager. It is typically used for resizing the frame with the
mouse and is therefore not shown on ``fullboth'' and maximized frames
(@pxref{Size Parameters}). Its width is determined by the window
manager and cannot be changed by Emacs' functions.
manager and cannot be changed by Emacs's functions.
External borders don't exist on text terminal frames. For graphical
frames, their display can be suppressed by setting the
@ -2283,7 +2283,7 @@ it on an undecorated frame.
If non-@code{nil}, this means that this is an @dfn{override redirect}
frame---a frame not handled by window managers under X@. Override
redirect frames have no window manager decorations, can be positioned
and resized only via Emacs' positioning and resizing functions and are
and resized only via Emacs's positioning and resizing functions and are
usually drawn on top of all other frames. Setting this parameter has
no effect on MS-Windows.
@ -2780,7 +2780,7 @@ visible, even though only the selected one is actually displayed.
@end defun
@defun frame-list-z-order &optional display
This function returns a list of Emacs' frames, in Z (stacking) order
This function returns a list of Emacs's frames, in Z (stacking) order
(@pxref{Raising and Lowering}). The optional argument @var{display}
specifies which display to poll. @var{display} should be either a frame
or a display name (a string). If omitted or @code{nil}, that stands for
@ -3157,7 +3157,7 @@ A frame on a graphical display may be @dfn{visible}, @dfn{invisible}, or
usual manner. If it is iconified, its contents are not displayed, but
there is a little icon somewhere to bring the frame back into view (some
window managers refer to this state as @dfn{minimized} rather than
@dfn{iconified}, but from Emacs' point of view they are the same thing).
@dfn{iconified}, but from Emacs's point of view they are the same thing).
If a frame is invisible, it is not displayed at all.
@cindex mapped frame

2
doc/lispref/functions.texi
View file

@ -2059,7 +2059,7 @@ is the better way to modify a named function because it keeps track of
the modifications, so they can be listed and undone.
Modifying a named function should be reserved for
the cases where you cannot modify Emacs' behavior in any other way.
the cases where you cannot modify Emacs's behavior in any other way.
If it is possible to do the same thing via a hook, that is preferable
(@pxref{Hooks}). If you simply want to change what a particular key
does, it may be better to write a new command, and remap the old

2
doc/lispref/nonascii.texi
View file

@ -732,7 +732,7 @@ character, a symbol whose name is the script to which the character
belongs, according to the Unicode Standard classification of the
Unicode code space into script-specific blocks. This char-table has a
single extra slot whose value is the list of all script symbols. Note
that Emacs' classification of characters into scripts is not a 1-for-1
that Emacs's classification of characters into scripts is not a 1-for-1
reflection of the Unicode standard, e.g. there is no @samp{symbol}
script in Unicode.
@end defvar

2
doc/lispref/package.texi
View file

@ -133,7 +133,7 @@ file (@pxref{Init File,,, emacs, The GNU Emacs Manual}).
@end defun
@deffn Command package-initialize &optional no-activate
This function initializes Emacs' internal record of which packages are
This function initializes Emacs's internal record of which packages are
installed, and then calls @code{package-activate-all}.
The optional argument @var{no-activate}, if non-@code{nil}, causes

2
doc/lispref/parsing.texi
View file

@ -2159,7 +2159,7 @@ node is a defun node but doesn't have a name, or the node is
@node Tree-sitter C API
@section Tree-sitter C API Correspondence
Emacs' tree-sitter integration doesn't expose every feature
Emacs's tree-sitter integration doesn't expose every feature
provided by tree-sitter's C API@. Missing features include:
@itemize

2
doc/lispref/searching.texi
View file

@ -1977,7 +1977,7 @@ To help diagnose problems in your regexps or in the regexp engine
itself, this function returns a string describing the compiled
form of @var{regexp}. To make sense of it, it can be necessary
to read at least the description of the @code{re_opcode_t} type in the
@code{src/regex-emacs.c} file in Emacs' source code.
@code{src/regex-emacs.c} file in Emacs's source code.
It is currently able to give a meaningful description only if Emacs
was compiled with @code{--enable-checking}.

38
doc/lispref/text.texi
View file

@ -3854,13 +3854,19 @@ controls the total height of the display line ending in that newline.
@xref{Line Height}.
@item wrap-prefix
If text has a @code{wrap-prefix} property, the prefix it defines will
be added at display time to the beginning of every continuation line
due to text wrapping (so if lines are truncated, the wrap-prefix is
never used). It may be a string or an image (@pxref{Other Display
Specs}), or a stretch of whitespace such as specified by the
@code{:width} or @code{:align-to} display properties (@pxref{Specified
Space}).
If a region of text has a @code{wrap-prefix} property, the prefix it
defines will be added at display time to the beginning of every
continuation line due to text wrapping (so if lines are truncated, the
wrap-prefix is never used). The property value may be a string or an
image (@pxref{Other Display Specs}), or a stretch of whitespace such as
specified by the @code{:width} or @code{:align-to} display properties
(@pxref{Specified Space}). Note that to have its effect, the
@code{wrap-prefix} property must be set on the entire region of text,
starting from the first character of the first line of that text and up
to the last character of the last line; otherwise, breaking the text
into lines in a different way might fail to display the prefix, because
the display engine checks for this property only immediately after
continuing a line.
A wrap-prefix may also be specified for an entire buffer using the
@code{wrap-prefix} buffer-local variable (however, a
@ -3868,12 +3874,18 @@ A wrap-prefix may also be specified for an entire buffer using the
the @code{wrap-prefix} variable). @xref{Truncation}.
@item line-prefix
If text has a @code{line-prefix} property, the prefix it defines will
be added at display time to the beginning of every non-continuation
line. It may be a string or an image (@pxref{Other Display
Specs}), or a stretch of whitespace such as specified by the
@code{:width} or @code{:align-to} display properties (@pxref{Specified
Space}).
If a region of text has a @code{line-prefix} property, the prefix it
defines will be added at display time to the beginning of every
non-continuation line. The property value may be a string or an image
(@pxref{Other Display Specs}), or a stretch of whitespace such as
specified by the @code{:width} or @code{:align-to} display properties
(@pxref{Specified Space}). Note that to have its effect, the
@code{line-prefix} property must be set on the entire region of text,
starting from the first character of the first line of that text and up
to the last character of the last line; otherwise, breaking the text
into lines in a different way might fail to display the prefix, because
the display engine checks for this property only when starting a new
line.
A line-prefix may also be specified for an entire buffer using the
@code{line-prefix} buffer-local variable (however, a

4
doc/misc/efaq-w32.texi
View file

@ -2218,7 +2218,7 @@ outdated. Tools available here that are useful for Emacs include:
@item OpenSSL - used by @code{gnus} to talk to servers over SSL.
@item Patch - used by @code{ediff-patch-file} and others to apply patches.
@item Tar - used by @code{tar-mode} to edit tar files.
@item TexInfo - used to build Emacs' manuals.
@item TexInfo - used to build Emacs's manuals.
@item Unzip - used by @code{archive-mode} for extracting zip files.
@item Xpm - library to support XPM images (bundled with Emacs binaries)
@item Zip - used by @code{archive-mode} for editing zip files.
@ -2245,7 +2245,7 @@ image libraries that it provides, even if they are not on the
@findex man
Man pages for Emacs and other ported programs that you have can be
read using Emacs' built-in manual reader @code{woman}. This
read using Emacs's built-in manual reader @code{woman}. This
requires no external programs, but if you do have a port of
@command{man}, there is also an Emacs wrapper @code{man} that
which may be slightly faster. A Windows version of @command{man} is

2
doc/misc/erc.texi
View file

@ -2127,7 +2127,7 @@ to IRC, and don't forget that you can roll back to the previous
version by running @kbd{M-x package-delete @key{RET}}.
@xref{Packages,,,emacs, The Emacs Editor}, for more information.
Note that a bug affecting Emacs' packaging machinery may prevent the
Note that a bug affecting Emacs's packaging machinery may prevent the
above method from working on Emacs versions 29 and below. Users on 29
can try running @kbd{C-u M-x package-install @key{RET}} instead.
Users on 28 and below can click on the @emph{installed} @samp{erc}

2
doc/misc/gnus.texi
View file

@ -12075,7 +12075,7 @@ article buffer. There are many methods for doing that, but two of
them are kind of default methods.
If your Emacs copy has been built with libxml2 support, then Gnus uses
Emacs' built-in, plain elisp Simple HTML Renderer @code{shr}
Emacs's built-in, plain elisp Simple HTML Renderer @code{shr}
@footnote{@code{shr} displays colors as declared in the @acronym{HTML}
article but tries to adjust them in order to be readable. If you
prefer more contrast, @xref{FAQ 4-16}.} which is also used by Emacs'

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

@ -144,7 +144,7 @@ and covers everything that goes into every tagged release of the themes.
:end:
The Modus themes are distributed with Emacs starting with version 28.1.
On older versions of Emacs, they can be installed using Emacs' package
On older versions of Emacs, they can be installed using Emacs's package
manager or manually from their code repository. There also exist
packages for distributions of GNU/Linux.
@ -4769,7 +4769,7 @@ and/or mode line setup.
:custom_id: h:4cc767dc-ffef-4c5c-9f10-82eb7b8921bf
:end:
Emacs' HTML rendering library ({{{file(shr.el)}}}) may need explicit
Emacs's HTML rendering library ({{{file(shr.el)}}}) may need explicit
configuration to respect the theme's colors instead of whatever
specifications the webpage provides.

4
doc/misc/org.org
View file

@ -3359,7 +3359,7 @@ Here is the full set of built-in link types:
- =gnus=, =rmail=, =mhe= ::
Link to messages or folders from a given Emacs' MUA.
Link to messages or folders from a given Emacs MUA.
- =help= ::
@ -23201,7 +23201,7 @@ than 30 stars. This is a hard-coded limitation of ~lmax~ in
2003, not the beginning of time.
[fn:29] On computers using macOS, idleness is based on actual user
idleness, not just Emacs' idle time. For X11, you can install a
idleness, not just Emacs's idle time. For X11, you can install a
utility program =x11idle.c=, available in the =org-contrib/=
repository, or install the xprintidle package and set it to the
variable ~org-clock-x11idle-program-name~ if you are running Debian,

2
doc/misc/transient.texi
View file

@ -1458,7 +1458,7 @@ When returning to the command-loop after calling the suffix command,
the arguments are reset to @code{nil} (which causes the function to return
@code{nil} too).
Like for Emacs' prefix arguments, it is advisable, but not mandatory,
Like for Emacs's prefix arguments, it is advisable, but not mandatory,
to access the infix arguments inside the command's @code{interactive} form.
The preferred way of doing that is to call the @code{transient-args}
function, which for infix arguments serves about the same purpose as

4
doc/misc/use-package.texi
View file

@ -575,7 +575,7 @@ add @code{:demand t} to those declarations.
Some users want to put all their customizations in use-package
declarations, even for variables, hooks, and options that are always
available, without loading any package.@footnote{In other words, they
are either preloaded in Emacs or defined in Emacs' C sources.}
are either preloaded in Emacs or defined in Emacs's C sources.}
For that purpose, you can use the no-op @samp{emacs} package:
@ -640,7 +640,7 @@ simply use @code{:if} and the appropriate Lisp expression.
@node Manual installation
@section Manually installed package
When installing packages manually, without Emacs' built-in package
When installing packages manually, without Emacs's built-in package
manager (@file{package.el}), it will obviously not help you set up
autoloads or add it to your @code{load-path}. You must do it
yourself. However, use-package makes this more convenient.

2
doc/misc/wisent.texi
View file

@ -1800,7 +1800,7 @@ But @samp{rules} part is parsed in Bison style! Why?
Rule delimiters are the colon (@code{:}), that follows the nonterminal
name, and a final semicolon (@code{;}). Unfortunately these
delimiters are not @code{open-paren}/@code{close-paren} type, and the
Emacs' syntactic analyzer can't easily isolate data between them to
Emacs syntactic analyzer can't easily isolate data between them to
produce a @samp{RULES_PART} parenthesis-block-like lexical token.
Consequently it is not possible to use @code{EXPANDFULL} to iterate in
@samp{RULES_PART}, like this:

5
etc/NEWS.30
View file

@ -1705,6 +1705,11 @@ This allows the user to either disable the display of any logo or
specify which logo will be displayed as part of the
buffer-identification in the mode-line of Gnus buffers.
---
*** 'gnus-summary-limit-to-age' now counts days since midnight.
"Less than 1 day" now means "since last midnight", rather than "less
than 24 hours old".
** Rmail
---

8
etc/ORG-NEWS
View file

@ -693,8 +693,8 @@ Org-Org (=ox-org=) export. The default value is ~t~.
*** New option ~org-babel-comint-fallback-regexp-threshold~
Org babel is often using Emacs' interactive REPL feature to implement
:session functionality in code blocks. However, Emacs' REPLs use
Org babel is often using Emacs's interactive REPL feature to implement
:session functionality in code blocks. However, Emacs's REPLs use
heuristics to detect which lines in the REPL buffer correspond to
output and which lines are user prompts.
@ -1990,7 +1990,7 @@ When ~org-latex-src-block-backend~ is set to ~engraved~,
=engrave-faces-latex= from [[http://elpa.gnu.org/packages/engrave-faces.html][engrave-faces]] is used to transcode source
blocks to LaTeX. This requires the =fvextra=, =float=, and (by
default, but not necessarily) =tcolorbox= LaTeX packages be
installed. It uses Emacs' font-lock information, and so tends to
installed. It uses Emacs's font-lock information, and so tends to
produce results superior to Minted or Listings.
*** Support for =#+include=-ing URLs
@ -8181,7 +8181,7 @@ that Calc formulas can operate on them.
**** org-ctags.el (Paul Sexton)
Targets like =<<my target>>= can now be found by Emacs' etag
Targets like =<<my target>>= can now be found by Emacs's etag
functionality, and Org-mode links can be used to link to
etags, also in non-Org-mode files. For details, see the file
/org-ctags.el/.

16
etc/PROBLEMS
View file

@ -3472,6 +3472,22 @@ file; for example:
* Runtime problems specific to PGTK build
** Whether a display server is available cannot be automatically detected.
When started with no arguments from a text terminal and in an
environment where no display server is specified, Emacs will print:
$ emacs
(emacs:3988): Gtk-WARNING **: 19:19:10.887: cannot open display:
and exit. This is a byproduct of GTK's not providing any means of
probing for a display connection before committing to opening one, and
cannot be addressed by Emacs. Rather, users must expressly request a
text mode session:
$ emacs -nw
[...]
** SECONDARY selections don't work on Wayland.
This is because the SECONDARY selection is not implemented by the

2
etc/refcards/orgcard.tex
View file

@ -1,5 +1,5 @@
% Reference Card for Org Mode
\def\orgversionnumber{9.7.8}
\def\orgversionnumber{9.7.9}
\def\versionyear{2024} % latest update
\input emacsver.tex

2
etc/tutorials/TUTORIAL
View file

@ -1103,7 +1103,7 @@ The manual also describes many other Emacs features.
---------------------
There's a rich set of packages for Emacs written by the community,
which extend Emacs' capabilities. These packages include support for
which extend Emacs's capabilities. These packages include support for
new languages, additional themes, plugins for integrating with
external applications, and much, much more.

2
lisp/cedet/semantic/wisent/grammar.el
View file

@ -518,7 +518,7 @@ Menu items are appended to the common grammar menu.")
(delete-trailing-whitespace))))))
(defun wisent-make-parsers ()
"Generate Emacs' built-in Wisent-based parser files."
"Generate Emacs's built-in Wisent-based parser files."
(interactive)
(semantic-mode 1)
;; Loop through each .wy file in current directory, and run

3
lisp/emacs-lisp/seq.el
View file

@ -3,12 +3,11 @@
;; Copyright (C) 2014-2024 Free Software Foundation, Inc.
;; Author: Nicolas Petton <nicolas@petton.fr>
;; Maintainer: emacs-devel@gnu.org
;; Keywords: sequences
;; Version: 2.24
;; Package: seq
;; Maintainer: emacs-devel@gnu.org
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify

3
lisp/emacs-lisp/thunk.el
View file

@ -3,12 +3,11 @@
;; Copyright (C) 2015-2024 Free Software Foundation, Inc.
;; Author: Nicolas Petton <nicolas@petton.fr>
;; Maintainer: emacs-devel@gnu.org
;; Keywords: sequences
;; Version: 1.0
;; Package: thunk
;; Maintainer: emacs-devel@gnu.org
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify

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

@ -39,7 +39,7 @@
;; C-v -> paste
;;
;; The tricky part is the handling of the C-x and C-c keys which
;; are normally used as prefix keys for most of Emacs' built-in
;; are normally used as prefix keys for most of Emacs's built-in
;; commands. With CUA they still do!!!
;;
;; Only when the region is currently active (and highlighted since
@ -138,7 +138,7 @@
;; cua-mode's superior rectangle support uses a true visual
;; representation of the selected rectangle, i.e. it highlights the
;; actual part of the buffer that is currently selected as part of the
;; rectangle. Unlike Emacs' traditional rectangle commands, the
;; rectangle. Unlike Emacs's traditional rectangle commands, the
;; selected rectangle always as straight left and right edges, even
;; when those are in the middle of a TAB character or beyond the end
;; of the current line. And it does this without actually modifying

2
lisp/external-completion.el
View file

@ -40,7 +40,7 @@
;; other in `completion-styles' are ignored.
;;
;; This compromise is for speed: all other styles need the full data
;; set to be available in Emacs' addressing space, which is often slow
;; set to be available in Emacs's addressing space, which is often slow
;; if not completely unfeasible.
;;
;; To make use of the `external' style the function

2
lisp/frame.el
View file

@ -2021,7 +2021,7 @@ workarea attribute."
(declare-function android-frame-list-z-order "androidfns.c" (&optional display))
(defun frame-list-z-order (&optional display)
"Return list of Emacs' frames, in Z (stacking) order.
"Return list of Emacs's frames, in Z (stacking) order.
The optional argument DISPLAY specifies which display to poll.
DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display.

4
lisp/frameset.el
View file

@ -179,7 +179,7 @@ Properties can be set with
;; What's the deal with these "filter alists"?
;;
;; Let's say that Emacs' frame parameters were never designed as a tool to
;; Let's say that Emacs's frame parameters were never designed as a tool to
;; precisely record (or restore) a frame's state. They grew organically,
;; and their uses and behaviors reflect their history. In using them to
;; implement framesets, the unwary implementer, or the prospective package
@ -277,7 +277,7 @@ Properties can be set with
;; display they do no harm, but they clutter the parameter alist.
;;
;; - `minibuffer': It can contain a reference to a live window, which cannot
;; be serialized. Because of Emacs' idiosyncratic treatment of this
;; be serialized. Because of Emacs's idiosyncratic treatment of this
;; parameter, frames created with (minibuffer . t) have a parameter
;; (minibuffer . #<window...>), while frames created with
;; (minibuffer . #<window...>) have (minibuffer . nil), which is madness

2
lisp/kmacro.el
View file

@ -22,7 +22,7 @@
;;; Commentary:
;; The kmacro package provides the user interface to Emacs' basic
;; The kmacro package provides the user interface to Emacs's basic
;; keyboard macro functionality. With kmacro, two function keys are
;; dedicated to keyboard macros, by default F3 and F4.

6
lisp/minibuffer.el
View file

@ -3343,7 +3343,7 @@ same as `substitute-in-file-name'."
(file-error nil))) ;PCM often calls with invalid directories.
(defun completion--sifn-requote (upos qstr)
;; We're looking for `qpos' such that:
;; We're looking for (the largest) `qpos' such that:
;; (equal (substring (substitute-in-file-name qstr) 0 upos)
;; (substitute-in-file-name (substring qstr 0 qpos)))
;; Big problem here: we have to reverse engineer substitute-in-file-name to
@ -3373,11 +3373,13 @@ same as `substitute-in-file-name'."
;; Main assumption: nothing after qpos should affect the text before upos,
;; so we can work our way backward from the end of qstr, one character
;; at a time.
;; Second assumptions: If qpos is far from the end this can be a bit slow,
;; Second assumption: If qpos is far from the end this can be a bit slow,
;; so we speed it up by doing a first loop that skips a word at a time.
;; This word-sized loop is careful not to cut in the middle of env-vars.
(while (let ((boundary (string-match "\\(\\$+{?\\)?\\w+\\W*\\'" qstr)))
(and boundary
;; Try and make sure we keep the largest `qpos' (bug#72176).
(not (string-match-p "/[/~]" qstr boundary))
(progn
(setq qprefix (substring qstr 0 boundary))
(string-prefix-p uprefix

2
lisp/net/newst-backend.el
View file

@ -220,7 +220,7 @@ which apply for this feed only, overriding the value of
(defcustom newsticker-retrieval-method
'intern
"Method for retrieving news from the web, either `intern' or `extern'.
Default value `intern' uses Emacs' built-in asynchronous download
Default value `intern' uses Emacs's built-in asynchronous download
capabilities (`url-retrieve'). If set to `extern' the external
program wget is used, see `newsticker-wget-name'."
:type '(choice :tag "Method"

1
lisp/nxml/nxml-mode.el
View file

@ -531,6 +531,7 @@ Many aspects this mode can be customized using
(setq-local comment-end-skip "[ \t\r\n]*-->")
(setq-local comment-line-break-function #'nxml-newline-and-indent)
(setq-local comment-quote-nested-function #'nxml-comment-quote-nested)
(setq-local comment-continue "") ; avoid double-hyphens as a padding
(save-excursion
(save-restriction
(widen)

2
lisp/org/ob-sql.el
View file

@ -208,7 +208,7 @@ Pass nil to omit that arg."
"Convert FILE to OS standard file name.
If in Cygwin environment, uses Cygwin specific function to
convert the file name. In a Windows-NT environment, do nothing.
Otherwise, use Emacs' standard conversion function."
Otherwise, use Emacs's standard conversion function."
(cond ((fboundp 'cygwin-convert-file-name-to-windows)
(format "%S" (cygwin-convert-file-name-to-windows file)))
((string= "windows-nt" system-type) file)

2
lisp/org/ol.el
View file

@ -542,7 +542,7 @@ original string length.")
(defvar-local org-target-link-regexps nil
"List of regular expressions matching radio targets in plain text.
This list is non-nil, when a single regexp would be too long to match
all the possible targets, exceeding Emacs' regexp length limit.")
all the possible targets, exceeding Emacs's regexp length limit.")
(defvar org-link-types-re nil
"Matches a link that has a url-like prefix like \"http:\".")

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

@ -459,7 +459,7 @@ FORMAT and ARGS are passed to `message'."
;; With all this in mind, we ensure `write-region-inhibit-fsync' is
;; set.
;;
;; To read more about this, see the comments in Emacs' fileio.c, in
;; To read more about this, see the comments in Emacs's fileio.c, in
;; particular the large comment block in init_fileio.
(let ((write-region-inhibit-fsync t)
;; We set UTF-8 here and in `org-persist--read-elisp-file'

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

@ -663,7 +663,7 @@ Leave point in edit buffer."
(defvar org-src-fontify-natively) ; Defined in org.el
(defun org-src-font-lock-fontify-block (lang start end)
"Fontify code block between START and END using LANG's syntax.
This function is called by Emacs' automatic fontification, as long
This function is called by Emacs's automatic fontification, as long
as `org-src-fontify-natively' is non-nil."
(let ((modified (buffer-modified-p)) native-tab-width)
(remove-text-properties start end '(face nil))

4
lisp/org/org-version.el
View file

@ -5,13 +5,13 @@
(defun org-release ()
"The release version of Org.
Inserted by installing Org mode or when a release is made."
(let ((org-release "9.7.8"))
(let ((org-release "9.7.9"))
org-release))
;;;###autoload
(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.7.8-5-gfdf0e0"))
(let ((org-git-version "release_9.7.9"))
org-git-version))
(provide 'org-version)

9
lisp/org/org.el
View file

@ -9,7 +9,7 @@
;; URL: https://orgmode.org
;; Package-Requires: ((emacs "26.1"))
;; Version: 9.7.8
;; Version: 9.7.9
;; This file is part of GNU Emacs.
;;
@ -20818,8 +20818,11 @@ end."
(when (and (not (eq org-yank-image-save-method 'attach))
(not (file-directory-p org-yank-image-save-method)))
(make-directory org-yank-image-save-method t))
(with-temp-file absname
(insert data))
;; DATA is a raw image. Tell Emacs to write it raw, without
;; trying to auto-detect the coding system.
(let ((coding-system-for-write 'emacs-internal))
(with-temp-file absname
(insert data)))
(if (null (eq org-yank-image-save-method 'attach))
(setq link (org-link-make-string (concat "file:" (file-relative-name absname))))
(require 'org-attach)

2
lisp/org/ox-latex.el
View file

@ -993,7 +993,7 @@ The most comprehensive option can be set with,
which causes source code to be run through
`engrave-faces-latex-buffer', which generates colorings using
Emacs' font-lock information. This requires the Emacs package
Emacs's font-lock information. This requires the Emacs package
engrave-faces (available from GNU ELPA), and the LaTeX package
fvextra be installed.

2
lisp/progmodes/bug-reference.el
View file

@ -535,7 +535,7 @@ From, and Cc against HEADER-REGEXP in
"An alist for setting up `bug-reference-mode' in IRC modes.
This takes action if `bug-reference-mode' is enabled in IRC
channels using one of Emacs' IRC clients. Currently, rcirc and
channels using one of Emacs's IRC clients. Currently, rcirc and
ERC are supported.
Each element has the form

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

@ -4651,7 +4651,7 @@ recursive calls in starting lines of here-documents."
(and (eq (preceding-char) ?\})
(cperl-after-block-p (point-min)))
(and (eq (char-syntax (preceding-char)) ?w)
(progn
(save-excursion
(forward-sexp -1)
;; After these keywords `/'
;; starts a RE. One should

2
lisp/server.el
View file

@ -1216,7 +1216,7 @@ The following commands are accepted by the client:
;; FIXME: Why do we wait 1s here but 5s in the other one?
(run-with-timer 1 nil #'delete-process proc)
;; We return immediately.
(cl-return-from server--process-filter)))
(cl-return-from server--process-filter-1)))
(let ((prev (process-get proc 'previous-string)))
(when prev
(setq string (concat prev string))

2
lisp/textmodes/less-css-mode.el
View file

@ -32,7 +32,7 @@
;; `less-css-compile-at-save' to t. To install "lessc" using the
;; Node.js package manager, run "npm install less".
;;
;; Also make sure the "lessc" executable is in Emacs' PATH, example:
;; Also make sure the "lessc" executable is in Emacs's PATH, example:
;; (push (expand-file-name "~/.gem/ruby/1.8/bin") exec-path)
;; or customize `less-css-lessc-command' to point to your "lessc"
;; executable.

4
lisp/textmodes/rst.el
View file

@ -56,7 +56,7 @@
;; There are a number of convenient key bindings provided by rst-mode. For the
;; bindings, try C-c C-h when in rst-mode. There are also many variables that
;; can be customized, look for defcustom in this file or look for the "rst"
;; customization group contained in the "wp" group.
;; customization group contained in the "text" group.
;;
;; If you use the table-of-contents feature, you may want to add a hook to
;; update the TOC automatically every time you adjust a section title::
@ -4437,7 +4437,7 @@ column is used (fill-column vs. end of previous/next line)."
;; LocalWords: docutils http sourceforge rst html wp svn svnroot txt reST regex
;; LocalWords: docutils http sourceforge rst html svn svnroot txt reST regex
;; LocalWords: regexes alist seq alt grp keymap abbrev overline overlines toc
;; LocalWords: XML PNT propertized init referenceable

2
lisp/transient.el
View file

@ -45,7 +45,7 @@
(unless (fboundp 'seq-keep)
(display-warning 'transient (substitute-command-keys "\
Transient requires `seq' >= 2.24,
but due to bad defaults, Emacs' package manager, refuses to
but due to bad defaults, Emacs's package manager, refuses to
upgrade this and other built-in packages to higher releases
from GNU Elpa, when a package specifies that this is needed.

7
lisp/which-key.el
View file

@ -130,9 +130,10 @@ For affected settings, see `which-key-replacement-alist', `which-key-ellipsis'
`which-key-separator'."
:set (lambda (sym val)
(custom-set-default sym val)
(mapc #'custom-reevaluate-setting
'(which-key-separator
which-key-ellipsis)))
(dolist (sym '(which-key-separator
which-key-ellipsis))
(when (get sym 'standard-value)
(custom-reevaluate-setting sym))))
:initialize #'custom-initialize-changed
:type 'boolean
:package-version "1.0" :version "30.1")

2
lwlib/lwlib-Xm.c
View file

@ -703,7 +703,7 @@ update_one_menu_entry (widget_instance* instance,
ac = 0;
XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
/* Non-zero values don't work reliably in
conjunction with Emacs' event loop */
conjunction with Emacs's event loop */
XtSetArg (al [ac], XmNmappingDelay, 0); ac++;
#ifdef XmNpositionIndex /* This is undefined on SCO ODT 2.0. */
/* Tell Motif to put it in the right place */

2
nt/INSTALL.W64
View file

@ -192,7 +192,7 @@ and if all went well, you will have a new 64-bit version of Emacs.
When running Emacs from outside the mingw64 shell, you will need to
add c:\msys64\mingw64\bin to your Windows PATH, or copy the needed
DLLs into Emacs' bin/ directory. Otherwise features such as TLS which
DLLs into Emacs's bin/ directory. Otherwise features such as TLS which
depend on those DLLs will be missing.
You can do this through Control Panel / System and Security / System /

2
nt/README.W32
View file

@ -233,7 +233,7 @@ See the end of the file for license conditions.
Virus scanners
Some virus scanners interfere with Emacs' use of subprocesses. If you
Some virus scanners interfere with Emacs's use of subprocesses. If you
are unable to use subprocesses and you use Dr. Solomon's WinGuard or
McAfee's Vshield, turn off "Scan all files" (WinGuard) or "boot sector
scanning" (McAfee exclusion properties).

2
nt/inc/ms-w32.h
View file

@ -603,7 +603,7 @@ typedef unsigned int EMACS_UINT;
Starting with MSVC 5.0, we must also place the uninitialized data
into its own section. VC5 intermingles uninitialized data from the CRT
between Emacs' static uninitialized data and its public uninitialized
between Emacs's static uninitialized data and its public uninitialized
data. A separate .bss section for Emacs groups both static and
public uninitialized together.

2
src/androidfns.c
View file

@ -1740,7 +1740,7 @@ android_frame_list_z_order (struct android_display_info *dpyinfo,
DEFUN ("android-frame-list-z-order", Fandroid_frame_list_z_order,
Sandroid_frame_list_z_order, 0, 1, 0,
doc: /* Return list of Emacs' frames, in Z (stacking) order.
doc: /* Return list of Emacs's frames, in Z (stacking) order.
The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be either a frame or a display name (a string). If
omitted or nil, that stands for the selected frame's display. Return

2
src/callproc.c
View file

@ -1721,7 +1721,7 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value,
Vprocess_environment))
return *value ? 1 : 0;
/* On Windows we make some modifications to Emacs' environment
/* On Windows we make some modifications to Emacs's environment
without recording them in Vprocess_environment. */
#ifdef WINDOWSNT
{

2
src/charset.c
View file

@ -101,7 +101,7 @@ Lisp_Object Vemacs_mule_charset_list;
int emacs_mule_charset[256];
/* Mapping table from ISO2022's charset (specified by DIMENSION,
CHARS, and FINAL-CHAR) to Emacs' charset. */
CHARS, and FINAL-CHAR) to Emacs's charset. */
int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];
#define CODE_POINT_TO_INDEX(charset, code) \

2
src/charset.h
View file

@ -467,7 +467,7 @@ extern bool charset_map_loaded;
#define ISO_MAX_FINAL 0x80 /* only 0x30..0xFF are used */
/* Mapping table from ISO2022's charset (specified by DIMENSION,
CHARS, and FINAL_CHAR) to Emacs' charset ID. Should be accessed by
CHARS, and FINAL_CHAR) to Emacs's charset ID. Should be accessed by
macro ISO_CHARSET_TABLE (DIMENSION, CHARS, FINAL_CHAR). */
extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];

22
src/coding.c
View file

@ -27,11 +27,11 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
0. General comments
1. Preamble
2. Emacs' internal format (emacs-utf-8) handlers
2. Emacs's internal format (emacs-utf-8) handlers
3. UTF-8 handlers
4. UTF-16 handlers
5. Charset-base coding systems handlers
6. emacs-mule (old Emacs' internal format) handlers
6. emacs-mule (old Emacs's internal format) handlers
7. ISO2022 handlers
8. Shift-JIS and BIG5 handlers
9. CCL handlers
@ -50,7 +50,7 @@ CODING SYSTEM
information about how to convert byte sequences to character
sequences and vice versa. When we say "decode", it means converting
a byte sequence of a specific coding system into a character
sequence that is represented by Emacs' internal coding system
sequence that is represented by Emacs's internal coding system
`emacs-utf-8', and when we say "encode", it means converting a
character sequence of emacs-utf-8 to a byte sequence of a specific
coding system.
@ -1104,7 +1104,7 @@ alloc_destination (struct coding_system *coding, ptrdiff_t nbytes,
#define EOL_SEEN_CRLF 4
/*** 2. Emacs' internal format (emacs-utf-8) ***/
/*** 2. Emacs's internal format (emacs-utf-8) ***/
@ -1757,9 +1757,9 @@ encode_coding_utf_16 (struct coding_system *coding)
}
/*** 6. Old Emacs' internal format (emacs-mule) ***/
/*** 6. Old Emacs's internal format (emacs-mule) ***/
/* Emacs' internal format for representation of multiple character
/* Emacs's internal format for representation of multiple character
sets is a kind of multi-byte encoding, i.e. characters are
represented by variable-length sequences of one-byte codes.
@ -1782,7 +1782,7 @@ encode_coding_utf_16 (struct coding_system *coding)
through 0xFF. See `charset.h' for more details about leading-code
and position-code.
--- CODE RANGE of Emacs' internal format ---
--- CODE RANGE of Emacs's internal format ---
character set range
------------- -----
ascii 0x00..0x7F
@ -2812,7 +2812,7 @@ encode_coding_emacs_mule (struct coding_system *coding)
localized platforms), and all of these are variants of ISO2022.
In addition to the above, Emacs handles two more kinds of escape
sequences: ISO6429's direction specification and Emacs' private
sequences: ISO6429's direction specification and Emacs's private
sequence for specifying character composition.
ISO6429's direction specification takes the following form:
@ -6045,7 +6045,7 @@ complement_process_encoding_system (Lisp_Object coding_system)
/* Emacs has a mechanism to automatically detect a coding system if it
is one of Emacs' internal format, ISO2022, SJIS, and BIG5. But,
is one of Emacs's internal format, ISO2022, SJIS, and BIG5. But,
it's impossible to distinguish some coding systems accurately
because they use the same range of codes. So, at first, coding
systems are categorized into 7, those are:
@ -6053,7 +6053,7 @@ complement_process_encoding_system (Lisp_Object coding_system)
o coding-category-emacs-mule
The category for a coding system which has the same code range
as Emacs' internal format. Assigned the coding-system (Lisp
as Emacs's internal format. Assigned the coding-system (Lisp
symbol) `emacs-mule' by default.
o coding-category-sjis
@ -10052,7 +10052,7 @@ encode_string_utf_8 (Lisp_Object string, Lisp_Object buffer,
Emacs decoding does.
If HANDLE-OVER-UNI is Qt, decode a 4 or 5-byte overlong sequence
that follows Emacs' internal representation for a character beyond
that follows Emacs's internal representation for a character beyond
Unicode range into the corresponding character, like the usual
Emacs decoding does.

2
src/filelock.c
View file

@ -73,7 +73,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
theoretically be updated by daemons running separately -- but this
whole idea is unimplemented; in practice, at least in our
environment, it seems such stale locks arise fairly infrequently, and
Emacs' standard methods of dealing with clashes suffice.
Emacs's standard methods of dealing with clashes suffice.
We use symlinks instead of normal files because (1) they can be
stored more efficiently on the filesystem, since the kernel knows

2
src/haikufns.c
View file

@ -2943,7 +2943,7 @@ It can later be retrieved with `x-get-resource'. */)
DEFUN ("haiku-frame-list-z-order", Fhaiku_frame_list_z_order,
Shaiku_frame_list_z_order, 0, 1, 0,
doc: /* Return list of Emacs' frames, in Z (stacking) order.
doc: /* Return list of Emacs's frames, in Z (stacking) order.
If TERMINAL is non-nil and specifies a live frame, return the child
frames of that frame in Z (stacking) order.

2
src/image.c
View file

@ -5437,7 +5437,7 @@ static const struct image_keyword xpm_format[XPM_LAST] =
#if defined HAVE_X_WINDOWS && !defined USE_CAIRO
/* Define ALLOC_XPM_COLORS if we can use Emacs' own color allocation
/* Define ALLOC_XPM_COLORS if we can use Emacs's own color allocation
functions for allocating image colors. Our own functions handle
color allocation failures more gracefully than the ones on the XPM
lib. */

2
src/itree.c
View file

@ -64,7 +64,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
==== FIXME: bug#58342 some important operations remain slow ===
The amortized costs of Emacs' previous-overlay-change and
The amortized costs of Emacs's previous-overlay-change and
next-overlay-change functions are O(N) with this data structure.
The root problem is that we only have an order for the BEG field,
but not the END. The previous/next overlay change operations need

2
src/msdos.c
View file

@ -599,7 +599,7 @@ dos_set_window_size (int *rows, int *cols)
*rows = ScreenRows ();
*cols = ScreenCols ();
/* Update Emacs' notion of screen dimensions. */
/* Update Emacs's notion of screen dimensions. */
screen_size_X = *cols;
screen_size_Y = *rows;
screen_size = *cols * *rows;

2
src/nsfns.m
View file

@ -1628,7 +1628,7 @@ ns_window_is_ancestor (NSWindow *win, NSWindow *candidate)
DEFUN ("ns-frame-list-z-order", Fns_frame_list_z_order,
Sns_frame_list_z_order, 0, 1, 0,
doc: /* Return list of Emacs' frames, in Z (stacking) order.
doc: /* Return list of Emacs's frames, in Z (stacking) order.
If TERMINAL is non-nil and specifies a live frame, return the child
frames of that frame in Z (stacking) order.

4
src/nsterm.m
View file

@ -577,7 +577,7 @@ ns_init_locale (void)
}
/* Check if LANG can be used for initializing the locale. If not,
use a default setting. Note that Emacs' main will undo the
use a default setting. Note that Emacs's main will undo the
setlocale below, initializing the locale from the
environment. */
if (setlocale (LC_ALL, lang) == NULL)
@ -1407,7 +1407,7 @@ ns_raise_frame (struct frame *f, BOOL make_key)
block_input ();
if (FRAME_VISIBLE_P (f))
{
if (make_key)
if (make_key && !f->no_accept_focus)
[[view window] makeKeyAndOrderFront: NSApp];
else
[[view window] orderFront: NSApp];

2
src/sqlite.c
View file

@ -700,7 +700,7 @@ MODULE should be the name of an SQlite module's file, a
shared library in the system-dependent format and having a
system-dependent file-name extension.
Only modules on Emacs' list of allowed modules can be loaded. */)
Only modules on Emacs's list of allowed modules can be loaded. */)
(Lisp_Object db, Lisp_Object module)
{
check_sqlite (db, false);

4
src/w32fns.c
View file

@ -3901,7 +3901,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam,
most probably, not needed -- and harms a lot).
So, with the usual message pump, the following call to TranslateMessage()
is not needed (and is going to be VERY harmful). With Emacs' message
is not needed (and is going to be VERY harmful). With Emacs's message
pump, the call is needed. */
if (do_translate)
{
@ -9321,7 +9321,7 @@ w32_frame_list_z_order (struct w32_display_info *dpyinfo, HWND window)
DEFUN ("w32-frame-list-z-order", Fw32_frame_list_z_order,
Sw32_frame_list_z_order, 0, 1, 0,
doc: /* Return list of Emacs' frames, in Z (stacking) order.
doc: /* Return list of Emacs's frames, in Z (stacking) order.
The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string). If
omitted or nil, that stands for the selected frame's display.

2
src/xfns.c
View file

@ -7060,7 +7060,7 @@ x_frame_list_z_order (struct x_display_info *dpyinfo, Window window)
DEFUN ("x-frame-list-z-order", Fx_frame_list_z_order,
Sx_frame_list_z_order, 0, 1, 0,
doc: /* Return list of Emacs' frames, in Z (stacking) order.
doc: /* Return list of Emacs's frames, in Z (stacking) order.
The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be either a frame or a display name (a string). If
omitted or nil, that stands for the selected frame's display. Return

2
src/xterm.c
View file

@ -32235,7 +32235,7 @@ x_initialize (void)
Xt_app_con = XtCreateApplicationContext ();
/* Register a converter from strings to pixels, which uses
Emacs' color allocation infrastructure. */
Emacs's color allocation infrastructure. */
XtAppSetTypeConverter (Xt_app_con,
XtRString, XtRPixel, cvt_string_to_pixel,
cvt_string_to_pixel_args,

2
test/lisp/emacs-lisp/ert-x-tests.el
View file

@ -308,7 +308,7 @@ desired effect."
(cl-loop for i below 3 do
(message "%s" i)))
;; Uses the implicit messages buffer truncation implemented
;; in Emacs' C core.
;; in Emacs's C core.
(c (x)
(ert-with-buffer-renamed ("*Messages*")
(let ((message-log-max x))

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

@ -1573,6 +1573,23 @@ not appropriate."
(should (equal (get-text-property (point) 'face)
font-lock-string-face))))))
(ert-deftest cperl-test-bug-72296 ()
"Verify that the perl modes correctly handle the flip-flop operator.
Two successive dots are an operator. A slash immediately following them
starts a regular expression, if there's another term between the dots
and the slash, then we have a division."
:tags '(:fontification)
;; Code from the bug report. The slash is a division. The following
;; number is not a string.
(let ((code "for (2..$n/2) { ...; }"))
(should (equal (nth 8 (cperl-test-ppss code "/")) nil)))
;; This is what the test for two successive dots wants to catch: The
;; flip-flop operator. Here, the number is part of a regexp, seen as
;; a string.
(let ((code "for (2../2/) { ...; }"))
(should (equal (nth 8 (cperl-test-ppss code "/")) 9)))
)
(ert-deftest test-indentation ()
(ert-test-erts-file (ert-resource-file "cperl-indents.erts")))

2
test/src/buffer-tests.el
View file

@ -1720,7 +1720,7 @@ This test works best when Emacs is configured with
--enable-checking=yes. This is a little bit like fuzz testing,
except this test has no way to reduce to a minimal failing test
case. Regardless, by exercising many corner cases bugs can be
found using Emacs' internal consistency assertions."
found using Emacs's internal consistency assertions."
(let* (
;; The size and slack for the test buffer size.
(buffer-size-target 1000)

2
test/src/callproc-tests.el
View file

@ -59,7 +59,7 @@
;; On MS-Windows, "nul.FOO" resolves to the null
;; device, and thus acts like an always-empty
;; file, for any FOO, in any directory. So
;; c:/null.exe passes Emacs' test for the file's
;; c:/null.exe passes Emacs's test for the file's
;; existence, and ensures we hit an error in the
;; w32 process spawn code.
(call-process "c:/nul.exe")

2
test/src/filelock-tests.el
View file

@ -68,7 +68,7 @@ unavailable to Lisp."
"Spoil the lock file for FILE-NAME.
Cause Emacs to report errors for various file locking operations
on FILE-NAME going forward. Create a file that is incompatible
with Emacs' file locking protocol, but uses the same name as
with Emacs's file locking protocol, but uses the same name as
FILE-NAME's lock file. A directory file is used, which is
portable in practice."
(make-directory (filelock-tests--make-lock-name file-name)))