From 67faaead754c0a11bd89fdcde2533bc51b71ef0e Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 24 Jul 2024 23:46:02 +0200 Subject: [PATCH 01/18] Don't refer to obsolete finder group "wp" * lisp/textmodes/rst.el: Don't refer to obsolete finder group "wp". --- lisp/textmodes/rst.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 5fbff4ba888..5f99ee016a2 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -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:: @@ -4438,7 +4438,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 From a79966156633ae1e49e3fef17ff7212c8f35a26f Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 25 Jul 2024 03:35:04 +0200 Subject: [PATCH 02/18] Standardize possessive apostrophe usage in manuals, docs, and comments See the note in admin/notes/documentation. Ref: https://lists.gnu.org/r/emacs-devel/2012-02/msg00649.html --- doc/lispref/frames.texi | 8 ++++---- doc/lispref/functions.texi | 2 +- doc/lispref/nonascii.texi | 2 +- doc/lispref/package.texi | 2 +- doc/lispref/parsing.texi | 2 +- doc/lispref/searching.texi | 2 +- doc/misc/efaq-w32.texi | 4 ++-- doc/misc/erc.texi | 2 +- doc/misc/gnus.texi | 2 +- doc/misc/modus-themes.org | 4 ++-- doc/misc/org.org | 4 ++-- doc/misc/transient.texi | 2 +- doc/misc/use-package.texi | 4 ++-- doc/misc/wisent.texi | 2 +- etc/ORG-NEWS | 8 ++++---- etc/tutorials/TUTORIAL | 2 +- lisp/cedet/semantic/wisent/grammar.el | 2 +- lisp/emulation/cua-base.el | 4 ++-- lisp/external-completion.el | 2 +- lisp/frame.el | 2 +- lisp/frameset.el | 4 ++-- lisp/kmacro.el | 2 +- lisp/net/newst-backend.el | 2 +- lisp/org/ob-sql.el | 2 +- lisp/org/ol.el | 2 +- lisp/org/org-persist.el | 2 +- lisp/org/org-src.el | 2 +- lisp/org/ox-latex.el | 2 +- lisp/progmodes/bug-reference.el | 2 +- lisp/textmodes/less-css-mode.el | 2 +- lisp/transient.el | 2 +- lwlib/lwlib-Xm.c | 2 +- nt/INSTALL.W64 | 2 +- nt/README.W32 | 2 +- nt/inc/ms-w32.h | 2 +- src/androidfns.c | 2 +- src/callproc.c | 2 +- src/charset.c | 2 +- src/charset.h | 2 +- src/coding.c | 22 +++++++++++----------- src/filelock.c | 2 +- src/haikufns.c | 2 +- src/image.c | 2 +- src/itree.c | 2 +- src/msdos.c | 2 +- src/nsfns.m | 2 +- src/nsterm.m | 2 +- src/sqlite.c | 2 +- src/w32fns.c | 4 ++-- src/xfns.c | 2 +- src/xterm.c | 2 +- test/lisp/emacs-lisp/ert-x-tests.el | 2 +- test/src/buffer-tests.el | 2 +- test/src/callproc-tests.el | 2 +- test/src/filelock-tests.el | 2 +- 55 files changed, 78 insertions(+), 78 deletions(-) diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index c56b37ce9b7..8744687a531 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -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 diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 0cf41072ec3..0131305525c 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -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 diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 1c5cc0e20b4..e5d552815e0 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -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 diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index eb0b4ca213c..6f7b7af12dd 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -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 diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi index 21e14b4632c..8f3c2b4a366 100644 --- a/doc/lispref/parsing.texi +++ b/doc/lispref/parsing.texi @@ -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 diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 7cefd581afb..7b4a9100e77 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -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}. diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index 411450cdc42..9ee5b679fed 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -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 diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 858e1ba34dc..33f35d9b5c6 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -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} diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index f4c87bd64dd..dbe4da29d54 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -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' diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 20fa93c6dbc..70ba8cdc02f 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -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. diff --git a/doc/misc/org.org b/doc/misc/org.org index dc7d8ef166f..dcc1ddc7f44 100644 --- a/doc/misc/org.org +++ b/doc/misc/org.org @@ -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, diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi index 7419ce39206..10e4c9deef1 100644 --- a/doc/misc/transient.texi +++ b/doc/misc/transient.texi @@ -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 diff --git a/doc/misc/use-package.texi b/doc/misc/use-package.texi index 9e11b349f20..da3deb081d9 100644 --- a/doc/misc/use-package.texi +++ b/doc/misc/use-package.texi @@ -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. diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi index d42fe09240a..ad59ce03a4a 100644 --- a/doc/misc/wisent.texi +++ b/doc/misc/wisent.texi @@ -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: diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index c5d1e872033..22212fa6d07 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -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 =<>= can now be found by Emacs' etag + Targets like =<>= 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/. diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 4718e0d9430..6398beda17a 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -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. diff --git a/lisp/cedet/semantic/wisent/grammar.el b/lisp/cedet/semantic/wisent/grammar.el index 7911dc04564..240157dc9b1 100644 --- a/lisp/cedet/semantic/wisent/grammar.el +++ b/lisp/cedet/semantic/wisent/grammar.el @@ -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 diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index c6586197fd4..c674a6b7a4d 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -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 diff --git a/lisp/external-completion.el b/lisp/external-completion.el index 4588640d0ad..f104c4a3758 100644 --- a/lisp/external-completion.el +++ b/lisp/external-completion.el @@ -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 diff --git a/lisp/frame.el b/lisp/frame.el index d2376f1e339..64f0d054df8 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -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. diff --git a/lisp/frameset.el b/lisp/frameset.el index 18e2a3ac666..488c4e14a7a 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -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 . #), while frames created with ;; (minibuffer . #) have (minibuffer . nil), which is madness diff --git a/lisp/kmacro.el b/lisp/kmacro.el index fa5572ec963..50ff875de52 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -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. diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 764ba979ddd..9c65a6ab0b7 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -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" diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index dc067a41719..5ece354ea6a 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el @@ -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) diff --git a/lisp/org/ol.el b/lisp/org/ol.el index 8a556c7b979..a16f27c2e30 100644 --- a/lisp/org/ol.el +++ b/lisp/org/ol.el @@ -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:\".") diff --git a/lisp/org/org-persist.el b/lisp/org/org-persist.el index 5cc572a78cc..8b0d9b110f9 100644 --- a/lisp/org/org-persist.el +++ b/lisp/org/org-persist.el @@ -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' diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index 0a9062f053a..229bf62e1c0 100644 --- a/lisp/org/org-src.el +++ b/lisp/org/org-src.el @@ -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)) diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index fcb0e20dc7e..79df1fe119e 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el @@ -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. diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el index 88af92420b5..3bcfc213fc6 100644 --- a/lisp/progmodes/bug-reference.el +++ b/lisp/progmodes/bug-reference.el @@ -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 diff --git a/lisp/textmodes/less-css-mode.el b/lisp/textmodes/less-css-mode.el index 198f067f1d8..51e62a712b4 100644 --- a/lisp/textmodes/less-css-mode.el +++ b/lisp/textmodes/less-css-mode.el @@ -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. diff --git a/lisp/transient.el b/lisp/transient.el index 14a94434c12..71702cbda2f 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -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. diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index dd3f63605a4..bbccd9d0981 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -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 */ diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64 index d25fc2e18af..9694e85f269 100644 --- a/nt/INSTALL.W64 +++ b/nt/INSTALL.W64 @@ -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 / diff --git a/nt/README.W32 b/nt/README.W32 index 33e252f7e01..5517d697d69 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -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). diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index cea0b072723..7212e4d2984 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -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. diff --git a/src/androidfns.c b/src/androidfns.c index af2247ad962..434a2f0d410 100644 --- a/src/androidfns.c +++ b/src/androidfns.c @@ -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 diff --git a/src/callproc.c b/src/callproc.c index e116298baef..3f2c60a2151 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -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 { diff --git a/src/charset.c b/src/charset.c index 675097c6843..e8d0826f4c2 100644 --- a/src/charset.c +++ b/src/charset.c @@ -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) \ diff --git a/src/charset.h b/src/charset.h index 1edb4a248ac..f08d536f635 100644 --- a/src/charset.h +++ b/src/charset.h @@ -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]; diff --git a/src/coding.c b/src/coding.c index b48164efc69..b21ed360578 100644 --- a/src/coding.c +++ b/src/coding.c @@ -27,11 +27,11 @@ along with GNU Emacs. If not, see . */ 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. diff --git a/src/filelock.c b/src/filelock.c index 43ede30975e..69bd0322d4c 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -73,7 +73,7 @@ along with GNU Emacs. If not, see . */ 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 diff --git a/src/haikufns.c b/src/haikufns.c index 4a31def4def..b4b88b434e4 100644 --- a/src/haikufns.c +++ b/src/haikufns.c @@ -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. diff --git a/src/image.c b/src/image.c index db1b05cbcd7..0b590faab76 100644 --- a/src/image.c +++ b/src/image.c @@ -5436,7 +5436,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. */ diff --git a/src/itree.c b/src/itree.c index 9dae279db90..749e65c2eed 100644 --- a/src/itree.c +++ b/src/itree.c @@ -64,7 +64,7 @@ along with GNU Emacs. If not, see . */ ==== 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 diff --git a/src/msdos.c b/src/msdos.c index e9faa48fa70..42eee89d748 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -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; diff --git a/src/nsfns.m b/src/nsfns.m index add7a93dfba..3c012ca8f05 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -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. diff --git a/src/nsterm.m b/src/nsterm.m index 2aadada2df6..575b24754e7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -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) diff --git a/src/sqlite.c b/src/sqlite.c index 32482b30f35..88b02339863 100644 --- a/src/sqlite.c +++ b/src/sqlite.c @@ -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); diff --git a/src/w32fns.c b/src/w32fns.c index f23d3c63b25..d20e7d53ea1 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -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. diff --git a/src/xfns.c b/src/xfns.c index 9bc2f794849..829bcb00f35 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -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 diff --git a/src/xterm.c b/src/xterm.c index 5e200203f64..215a3ed3bbe 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -32245,7 +32245,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, diff --git a/test/lisp/emacs-lisp/ert-x-tests.el b/test/lisp/emacs-lisp/ert-x-tests.el index 71ccab52834..6833871dad0 100644 --- a/test/lisp/emacs-lisp/ert-x-tests.el +++ b/test/lisp/emacs-lisp/ert-x-tests.el @@ -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)) diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el index bb897377d41..26a0fb9fd76 100644 --- a/test/src/buffer-tests.el +++ b/test/src/buffer-tests.el @@ -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) diff --git a/test/src/callproc-tests.el b/test/src/callproc-tests.el index a8b5a4372d6..5eee2f8d7c0 100644 --- a/test/src/callproc-tests.el +++ b/test/src/callproc-tests.el @@ -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") diff --git a/test/src/filelock-tests.el b/test/src/filelock-tests.el index c644747a23e..9bb3a27add7 100644 --- a/test/src/filelock-tests.el +++ b/test/src/filelock-tests.el @@ -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))) From b97786d9f6ec242501e8db40bb4da08f0f64d04d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 25 Jul 2024 10:41:18 +0300 Subject: [PATCH 03/18] ; * etc/NEWS: Entry for 'gnus-summary-limit-to-age' (bug#72204). --- etc/NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index ea0ea978f23..90e3a42beb1 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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 --- From 9eea6be5abffa91d21ea299158d5a2cd6cfb5089 Mon Sep 17 00:00:00 2001 From: Konstantin Kharlamov Date: Tue, 25 Jun 2024 12:26:12 +0300 Subject: [PATCH 04/18] Don't produce invalid XML with multi-line commenting style Both XML and HTML forbid double hyphens inside comments. However, nxml-mode was using a `!--' as a comment padding if `comment-style' was set to any of the styles that supposed to add padding. This infix was auto-derived due to `comment-continue' being nil. To fix that set `comment-continue' explicitly. It's unclear what padding should be used, but from looking at other editors it seems they don't typically add padding in XML, so let's be simple for now and just set `comment-continue' to empty string. * lisp/nxml/nxml-mode.el (nxml-mode): Make 'comment-continue' a buffer-local variable set to the empty string. (Bug#71772) --- lisp/nxml/nxml-mode.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index 02391dc6968..a58d3f3c75f 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el @@ -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) From 68906f184cba8b1fb75401917cccfe219f6826b0 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 25 Jul 2024 12:06:21 +0200 Subject: [PATCH 05/18] * admin/notes/spelling: Update note. --- admin/notes/spelling | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/admin/notes/spelling b/admin/notes/spelling index b20f68bf624..e0cf3998ace 100644 --- a/admin/notes/spelling +++ b/admin/notes/spelling @@ -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 From 7170282a59a1981cd44f46d69a28f2c47a46884b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 25 Jul 2024 08:39:38 -0400 Subject: [PATCH 06/18] lisp/minibuffer.el (completion--sifn-requote): Fix bug#72176 --- lisp/minibuffer.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index baed4edcf89..bef565378ea 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -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 From af527051cd33a90321ab2bac8c0f1f7bcb0af441 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 25 Jul 2024 16:15:52 +0200 Subject: [PATCH 07/18] ; * admin/MAINTAINERS: Remove Nicolas Petton. Change agreed with Nicolas Petton . --- admin/MAINTAINERS | 12 ------------ lisp/emacs-lisp/seq.el | 3 +-- lisp/emacs-lisp/thunk.el | 3 +-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index c15401ddeb2..23b4b246523 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -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 @@ -334,10 +326,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 diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index a20cff16982..73c22d2d4a7 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -3,12 +3,11 @@ ;; Copyright (C) 2014-2024 Free Software Foundation, Inc. ;; Author: Nicolas Petton +;; 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 diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el index 1776ca0de40..e2a83b06b30 100644 --- a/lisp/emacs-lisp/thunk.el +++ b/lisp/emacs-lisp/thunk.el @@ -3,12 +3,11 @@ ;; Copyright (C) 2015-2024 Free Software Foundation, Inc. ;; Author: Nicolas Petton +;; 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 From fdc133e97f6527693571472d058beb0e4fb80343 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Thu, 25 Jul 2024 17:30:25 +0200 Subject: [PATCH 08/18] Fix bug in server.el introduced by 0d7d835902df 0d7d835902df renamed 'server--process-filter' into 'server--process-filter-1' but updated the corresponding 'cl-return-from' tag to 'server--process-filter'. * lisp/server.el (server--process-filter-1): Fix 'cl-return-from' tag. --- lisp/server.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/server.el b/lisp/server.el index 27fbe95b64b..abfd3d4d753 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -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)) From fcd4e4c895de57ade38e609021769e3e63399a14 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 25 Jul 2024 21:29:22 +0300 Subject: [PATCH 09/18] ; * admin/MAINTAINERS: Add myself for maintaining some areas. --- admin/MAINTAINERS | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 23b4b246523..eb0fef665e6 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -225,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. @@ -352,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. ============================================================================== From c27055a938aadec81e4603d00e7d0997c4d2579f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20J=C3=B6rg?= Date: Thu, 25 Jul 2024 22:00:10 +0200 Subject: [PATCH 10/18] ; cperl-mode.el: Fix fontification of flip-flop (Bug#72296) * lisp/progmodes/cperl-mode.el (cperl-find-pods-heres): Prevent a movement of point from bleeding into a following clause. * test/lisp/progmodes/cperl-mode-tests.el (cperl-test-bug-72296): Add a test for the flip-flop operator with code from the report. --- lisp/progmodes/cperl-mode.el | 2 +- test/lisp/progmodes/cperl-mode-tests.el | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 217125e1599..3353bffdf05 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -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 diff --git a/test/lisp/progmodes/cperl-mode-tests.el b/test/lisp/progmodes/cperl-mode-tests.el index 02230049596..7a6e0b3b64a 100644 --- a/test/lisp/progmodes/cperl-mode-tests.el +++ b/test/lisp/progmodes/cperl-mode-tests.el @@ -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"))) From 268a2d10fc9c6578db23d54f7d790ec591cf211c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 26 Jul 2024 09:14:43 +0300 Subject: [PATCH 11/18] Improve documentation of '--init-directory' command-line option. * doc/emacs/custom.texi (Find Init): * doc/emacs/cmdargs.texi (Initial Options): More accurate and detailed description of what '--init-directory' does and how it affects the Emacs session. Add index entries and cross-references as needed. (Bug#72294) --- doc/emacs/cmdargs.texi | 10 ++++++++++ doc/emacs/custom.texi | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 49810ee7693..cd7d2be6d2f 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -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 init file. In +particular, if there's no init file in the directory named by this +option, Emacs will find and use the init file 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 +the init file in this directory, make sure it exists there before +starting Emacs with this option. @item --no-splash @opindex --no-splash diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 1527e42bbfe..4b16410eeec 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2958,8 +2958,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 From 87389f9ff9069f8e3b11ea0ff2e55619763c2231 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 26 Jul 2024 14:56:14 +0300 Subject: [PATCH 12/18] ; Improve documentation of 'line-prefix' and 'wrap-prefix'. * doc/lispref/text.texi (Special Properties): Spell out more accurately how 'line-prefix' and 'wrap-prefix' properties should be set. --- doc/lispref/text.texi | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index bb700c279ce..196fe89a092 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -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 From 309d0a718644385eb73f40c5eaa967e9b1548353 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Fri, 26 Jul 2024 20:14:43 +0800 Subject: [PATCH 13/18] Add PROBLEMS entry for bug#72303 * etc/PROBLEMS (Runtime problems specific to PGTK build): Document that text mode sessions cannot be started without `-nw'. (bug#72303) --- etc/PROBLEMS | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index f8fb9f90c0b..c1ad8321fa6 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -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 From 5c08cd4e7c38248ae455e3a55aa1d3f49a3d2894 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 26 Jul 2024 16:11:16 +0300 Subject: [PATCH 14/18] ; * doc/emacs/cmdargs.texi (Initial Options): Fix last change. --- doc/emacs/cmdargs.texi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index cd7d2be6d2f..ba4b45d272b 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -354,13 +354,13 @@ 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 init file. In -particular, if there's no init file in the directory named by this -option, Emacs will find and use the init file 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 -the init file in this directory, make sure it exists there before -starting Emacs with this option. +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 From 59a895ec4991beff9862029a712b22b47c5b70b3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 26 Jul 2024 16:55:10 +0300 Subject: [PATCH 15/18] ; * .gitignore: Add lisp/eshell/esh-groups.el. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index eb76ff330b8..9c58e2ebfac 100644 --- a/.gitignore +++ b/.gitignore @@ -130,6 +130,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 From 68a5f1f7d185250e61538f3af764b6e4ea62433f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerd=20M=C3=B6llmann?= Date: Fri, 26 Jul 2024 11:48:24 +0200 Subject: [PATCH 16/18] NS: prevent makeKeyWindow warnings (bug#69525) * src/nsterm.m (ns_raise_frame): Don't makeKeyWindow if frame has no_accept_focus set. --- src/nsterm.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nsterm.m b/src/nsterm.m index 575b24754e7..d25f216edd4 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -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]; From 1ae2f004473c1cc26ab654481716c9efb4ecd8de Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Fri, 26 Jul 2024 23:26:14 +0200 Subject: [PATCH 17/18] Fix edge-case with 'which-key-dont-use-unicode' setter * lisp/which-key.el (which-key-dont-use-unicode): Check if the user options have a 'standard-value' before proceeding to reevaluate. This avoids accidentally setting the symbol value to nil, before the user option has been declared, overriding the actual non-nil, default values. (Bug#72077) --- lisp/which-key.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/which-key.el b/lisp/which-key.el index 37b42a009f7..34de676616f 100644 --- a/lisp/which-key.el +++ b/lisp/which-key.el @@ -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") From 88e1ec22f271b127d961896b7dddcd58df289c42 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 26 Jul 2024 23:58:01 -0400 Subject: [PATCH 18/18] Update to Org 9.7.9 --- etc/refcards/orgcard.tex | 2 +- lisp/org/org-version.el | 4 ++-- lisp/org/org.el | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index b924aed8df5..b112e957d1d 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -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 diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 993e021f82e..d5a434e805d 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -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) diff --git a/lisp/org/org.el b/lisp/org/org.el index 8ca9a4b716b..0b3566121d9 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -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)