diff --git a/.gitignore b/.gitignore
index 143ee31a7a5..eb51921aa38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,14 +18,15 @@
# along with GNU Emacs. If not, see .
-# Currently we assume only Git 1.7.1 (April 2010) or later, so this
-# file does not rely on "**" in patterns. The "**" feature was added
-# in Git 1.8.2 (March 2013).
-
-
-# Personal customization.
-.dir-locals-2.el
-.no-advice-on-failure
+# Ignore all dot-files except for those under version control.
+.*
+!.clang-format
+!.clangd
+!.dir-locals.el
+!.gitattributes
+!.gitignore
+!.gitlab-ci.yml
+!.mailmap
# Built by 'autogen.sh'.
/aclocal.m4
@@ -119,8 +120,8 @@ cross/ndk-build/ndk-build.mk
cross/ndk-build/*.o
# Lisp-level sources built by 'make'.
-*cus-load.el
-*loaddefs.el
+lisp/**/*cus-load.el
+lisp/**/*loaddefs.el
lisp/cedet/semantic/bovine/c-by.el
lisp/cedet/semantic/bovine/make-by.el
lisp/cedet/semantic/bovine/scm-by.el
@@ -319,7 +320,6 @@ gnustmp*
*.orig
*.swp
*~
-.#*
\#*\#
ChangeLog
#[0-9]*.patch
@@ -368,17 +368,8 @@ lib-src/seccomp-filter-exec.pfc
# Ignore directory made by admin/make-manuals.
/manual/
-# Ignore Finder files on MacOS.
-.DS_Store
-
-# Ignore a directory used by dap-mode.
-.vscode
/test/gmp.h
-# GDB history
-.gdb_history
-_gdb_history
-
# Files ignored in exec/.
exec/aclocal.m4
exec/config.guess
diff --git a/ChangeLog.3 b/ChangeLog.3
index 1398b9bcf53..80ea900477e 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -17355,7 +17355,7 @@
([EmacsView viewDidResize:]):Don't explicitly release surfaces.
([EmacsView initFrameFromEmacs:]): Move the layer code to after the
NSWindow has been created as creating the layer now relies on some of
- it's properties.
+ its properties.
([EmacsView makeBackingLayer]): New function.
([EmacsView lockFocus]):
([EmacsView focusOnDrawingBuffer]): Rename to lockFocus.
@@ -128823,7 +128823,7 @@
(setq message-send-mail-function 'message-send-mail-with-sendmail)
(setq sendmail-program "msmtp")
- the message seding is handled by an external program, so no Unicode
+ the message sending is handled by an external program, so no Unicode
encoding is performed in Emacs. Thus Emacs must not assert that the
Unicode encoding was performed.
@@ -128870,7 +128870,7 @@
Change default offset of CC Mode syntactic symbol inlambda to 0
- It's previous default was c-lineup-inexpr-block. This change is mainly to
+ Its previous default was c-lineup-inexpr-block. This change is mainly to
prevent excessive indentation of the innards of C++ lambda functions.
* lisp/progmodes/cc-vars.el (c-offsets-alist): Amend the offset for inlambda
@@ -129602,7 +129602,7 @@
2019-05-27 Glenn Morris
- * test/lisp/autorevert-tests.el: Give on on remote hydra.nixos tests.
+ * test/lisp/autorevert-tests.el: Give up on remote hydra.nixos tests.
(auto-revert--test-enabled-remote): Disable on hydra.nixos.
@@ -135286,7 +135286,7 @@
92ce2dd Improve documentation of window parameters
6dc42c5 Improve commentary in frame.el
a8cffcf Fix typo in a doc string
- 9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercas...
+ 9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercase...
# Conflicts:
# lisp/vc/vc.el
@@ -155238,7 +155238,7 @@
d6aa55e Avoid segfaults in replace-buffer-contents with large buffers
d22b8d1 Adjust for scaling for mode-line popup menus (Bug#31880)
3d2e3dc Change name of `seqp' argument (Bug#26411)
- 40e1db8 Change index of ";" to better reflect it's usage (Bug#31623)
+ 40e1db8 Change index of ";" to better reflect its usage (Bug#31623)
d289e7e Fix bug of 'mouse-drag-and-drop-region' to detect edges of re...
e292c09 Fix #'fun handling inside `labels' (Bug#31792)
@@ -176477,7 +176477,7 @@
2018-06-20 Noam Postavsky
- Change index of ";" to better reflect it's usage (Bug#31623)
+ Change index of ";" to better reflect its usage (Bug#31623)
* doc/lispref/objects.texi (Comments): "; for commenting" fits better
with the following text about how a semicolon begins a comment. Also
@@ -217678,7 +217678,7 @@
Add seq-random-elt to seq.el
* lisp/emacs-lisp/seq.el (seq-random-elt): Add function to return a
- random element from it's sequence parameter.
+ random element from its sequence parameter.
* test/lisp/emacs-lisp/seq-tests.el (test-seq-random-elt-take-all
test-seq-random-elt-return-nil): Test the new function
@@ -223245,7 +223245,7 @@
Make ‘delete-trailing-whitespace’ delete spaces after form feed
* lisp/simple.el (delete-trailing-whitespace): Treat form fead as
- a non-whitespace character (regradless of whether it’s character syntax
+ a non-whitespace character (regardless of whether its character syntax
is whitespace) and delete any whitespace following it instead of leaving
lines with form feeds completely unchanged. I.e. a line like "\f " will
now became "\f".
diff --git a/ChangeLog.4 b/ChangeLog.4
index 364fa212709..be1eb2f80b4 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -309,7 +309,7 @@
2024-03-31 Michael Albinus
- Adapt Tramp versio (don't merge)
+ Adapt Tramp version (don't merge)
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.3".
@@ -8476,8 +8476,8 @@
changes, make hint overlays span one character (instead of being
length 0). Give the overlays an "evaporate" property.
- Given an inlay hints at position POS, its attached to [POS, POS+1] if
- it's kind=1 (usually type hints) and [POS-1, POS] otherwise. For
+ Given an inlay hints at position POS, it's attached to [POS, POS+1] if
+ its kind=1 (usually type hints) and [POS-1, POS] otherwise. For
kind=1 hints, the 'cursor position of the first such overlay is also
tweaked, so that's it's less awkward to edit around it.
@@ -9313,7 +9313,7 @@
Not the subject of it, but mentioned in bug#61893.
* lisp/progmodes/c-ts-mode.el (c-ts-mode--anchor-prev-sibling): Skip
- the sibling if it doesn't start on it's own line.
+ the sibling if it doesn't start on its own line.
* test/lisp/progmodes/c-ts-mode-resources/indent.erts: New test.
2023-03-05 Kyle Meyer
@@ -24470,7 +24470,7 @@
(treesit-major-mode-setup): Instead of binding
font-lock-fontify-region-function, now bind to
font-lock-fontify-syntactically-function. And we can let font-lock do
- it's thing.
+ its thing.
2022-10-31 Yuan Fu
@@ -28715,7 +28715,7 @@
Fix Tramp completion on MS Windows
* lisp/net/tramp.el (tramp-build-remote-file-name-spec-regexp):
- Revert previous change, it's too complicate.
+ Revert previous change, it's too complicated.
(tramp-build-completion-file-name-regexp):
Use `tramp-prefix-format' instead of `tramp-prefix-regexp'. (Bug#558133)
@@ -37079,7 +37079,7 @@
* src/xselect.c (lisp_data_to_selection_data): Assume an empty
vector represents INTEGER data, instead of blindly trying to
- aref it's first element.
+ aref its first element.
2022-09-04 Jim Porter
@@ -40542,7 +40542,7 @@
* doc/misc/gnus.texi (The problem of spam): Don't explain what
spam is; there is no need for that in 2022. Don't explain
- limitations of obsolete software TMDA; it's website has stopped
+ limitations of obsolete software TMDA; its website has stopped
working but seems to have been updated last in 2007.
(Thwarting Email Spam, Anti-Spam Basics)
(Spam Package Configuration Examples): Prefer "spam" to "UCE".
@@ -63333,7 +63333,7 @@
Correct indentation of opening brace in xdisp.c, which isn't at start of defun
* xdisp.c (calc_pixel_width_or_height): indent the opening brace of a
- substatement correctly. It's previous position, in column 0, caused
+ substatement correctly. Its previous position, in column 0, caused
indentation errors in C Mode.
2022-05-17 Po Lu
diff --git a/ChangeLog.android b/ChangeLog.android
index e86ef7a2a77..1acf157dfbf 100644
--- a/ChangeLog.android
+++ b/ChangeLog.android
@@ -5406,7 +5406,7 @@
(syms_of_androidselect): Define it.
* src/emacs.c (load_pdump): Eschew excessively elaborate dump file
- location code on on Android.
+ location code on Android.
* src/pdumper.c (Fdump_emacs_portable): Allow dumping while
interactive on Android.
diff --git a/admin/coccinelle/process.cocci b/admin/coccinelle/process.cocci
deleted file mode 100644
index bf295ab7b6f..00000000000
--- a/admin/coccinelle/process.cocci
+++ /dev/null
@@ -1,110 +0,0 @@
-// Change direct access to Lisp_Object fields of struct Lisp_Process to PVAR.
-@@
-struct Lisp_Process *P;
-Lisp_Object O;
-@@
-(
-- P->tty_name
-+ PVAR (P, tty_name)
-|
-- P->name
-+ PVAR (P, name)
-|
-- P->command
-+ PVAR (P, command)
-|
-- P->filter
-+ PVAR (P, filter)
-|
-- P->sentinel
-+ PVAR (P, sentinel)
-|
-- P->log
-+ PVAR (P, log)
-|
-- P->buffer
-+ PVAR (P, buffer)
-|
-- P->childp
-+ PVAR (P, childp)
-|
-- P->plist
-+ PVAR (P, plist)
-|
-- P->type
-+ PVAR (P, type)
-|
-- P->mark
-+ PVAR (P, mark)
-|
-- P->status
-+ PVAR (P, status)
-|
-- P->decode_coding_system
-+ PVAR (P, decode_coding_system)
-|
-- P->decoding_buf
-+ PVAR (P, decoding_buf)
-|
-- P->encode_coding_system
-+ PVAR (P, encode_coding_system)
-|
-- P->encoding_buf
-+ PVAR (P, encoding_buf)
-|
-- P->write_queue
-+ PVAR (P, write_queue)
-
-|
-
-- XPROCESS (O)->tty_name
-+ PVAR (XPROCESS (O), tty_name)
-|
-- XPROCESS (O)->name
-+ PVAR (XPROCESS (O), name)
-|
-- XPROCESS (O)->command
-+ PVAR (XPROCESS (O), command)
-|
-- XPROCESS (O)->filter
-+ PVAR (XPROCESS (O), filter)
-|
-- XPROCESS (O)->sentinel
-+ PVAR (XPROCESS (O), sentinel)
-|
-- XPROCESS (O)->log
-+ PVAR (XPROCESS (O), log)
-|
-- XPROCESS (O)->buffer
-+ PVAR (XPROCESS (O), buffer)
-|
-- XPROCESS (O)->childp
-+ PVAR (XPROCESS (O), childp)
-|
-- XPROCESS (O)->plist
-+ PVAR (XPROCESS (O), plist)
-|
-- XPROCESS (O)->type
-+ PVAR (XPROCESS (O), type)
-|
-- XPROCESS (O)->mark
-+ PVAR (XPROCESS (O), mark)
-|
-- XPROCESS (O)->status
-+ PVAR (XPROCESS (O), status)
-|
-- XPROCESS (O)->decode_coding_system
-+ PVAR (XPROCESS (O), decode_coding_system)
-|
-- XPROCESS (O)->decoding_buf
-+ PVAR (XPROCESS (O), decoding_buf)
-|
-- XPROCESS (O)->encode_coding_system
-+ PVAR (XPROCESS (O), encode_coding_system)
-|
-- XPROCESS (O)->encoding_buf
-+ PVAR (XPROCESS (O), encoding_buf)
-|
-- XPROCESS (O)->write_queue
-+ PVAR (XPROCESS (O), write_queue)
-)
diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index f01302b7931..733e548a598 100644
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -87,7 +87,7 @@ be shown. On positions 3,4, and 7, the @samp{alog} function will be
As is my wont, I started hacking on it almost immediately. I first
The latter criterion is the "je ne sais quoi" of the artistic aspect of
order but are now listed consecutively en bloc.
- "mot de passe" "Mot de passe")
+ "mot de passe" "Mot de passe")
Reported by Mor Zahavi . (Bug#51271)
* etc/refcards/fr-refcard.tex (section{Formater}): Remove mention
Reported by Ture Pålsson.
diff --git a/admin/codespell/codespell.ignore b/admin/codespell/codespell.ignore
index 02bd6d05838..ebb85e510bb 100644
--- a/admin/codespell/codespell.ignore
+++ b/admin/codespell/codespell.ignore
@@ -32,6 +32,7 @@ msdos
ot
parm
parms
+proced
reenable
reenabled
requestor
diff --git a/admin/release-branch.txt b/admin/release-branch.txt
index 0c393a9eccb..b59bc12dfb9 100644
--- a/admin/release-branch.txt
+++ b/admin/release-branch.txt
@@ -42,7 +42,8 @@ Instructions for cutting the Emacs release branch
M-x set-version RET XY+1.0.50 RET
- This creates a new file etc/NEWS.XY. "git add" it.
+ This creates a new file etc/NEWS. "git add" it.
+ (The original NEWS gets renamed into NEWS.XY.)
Change the value of 'customize-changed-options-previous-release'
in cus-edit.el to reference emacs-XY.1, the next version to be
@@ -60,7 +61,7 @@ Instructions for cutting the Emacs release branch
module_env_snippet_XY+1="$srcdir/src/module-env-XY+1.h"
. adding a new 'struct emacs_env_XY+1' to src/emacs-module.h.in,
- with the contents identical to'struct emacs_env_XY', with one
+ with the contents identical to 'struct emacs_env_XY', with one
line added:
@module_env_snippet_XY+1@
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 16a9405a7cb..49e7ef95cef 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -495,7 +495,7 @@ sub git_dir_option($)
# Complain about any unused entry in the --amend=F specified file.
my $fail = 0;
- foreach my $sha (keys %$amend_code)
+ foreach my $sha (sort keys %$amend_code)
{
warn "$ME:$amend_file: unused entry: $sha\n";
$fail = 1;
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 7c56c9c0151..b1d7a6f67f6 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -170,7 +170,7 @@ while test $# -ne 0; do
-T) is_target_a_directory=never;;
- --version) echo "$0 $scriptversion"; exit $?;;
+ --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
--) shift
break;;
@@ -345,7 +345,7 @@ do
' 0
# Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directly in world-writable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
@@ -353,7 +353,7 @@ do
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
+ # Check for POSIX incompatibility with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
diff --git a/build-aux/ndk-build-helper-1.mk b/build-aux/ndk-build-helper-1.mk
index 985f7cddfaf..4420eb433f4 100644
--- a/build-aux/ndk-build-helper-1.mk
+++ b/build-aux/ndk-build-helper-1.mk
@@ -35,7 +35,7 @@ NDK_CXX_FLAG_$(LOCAL_MODULE) :=
$(info Building $(build_kind))
$(info $(LOCAL_MODULE))
-$(info $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES$(EMACS_ABI))))
+$(info $(addprefix $(LOCAL_PATH:%/=%)/,$(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES$(EMACS_ABI))))
ifeq ($(filter-out lib%,$(LOCAL_MODULE)),)
NDK_SO_NAMES = $(LOCAL_MODULE)_emacs.so
@@ -106,7 +106,7 @@ endif
$(info $(foreach dir,$(NDK_INCLUDES),-I$(dir)))
$(info $(LOCAL_EXPORT_CFLAGS))
-$(info $(LOCAL_EXPORT_LDFLAGS) $(abspath $(addprefix $(NDK_BUILD_DIR)/,$(NDK_A_NAMES))) -L$(abspath $(NDK_BUILD_DIR)) $(foreach soname,$(NDK_SO_NAMES),-l:$(soname)))
+$(info $(LOCAL_EXPORT_LDFLAGS) $(abspath $(addprefix $(NDK_BUILD_DIR:%/=%)/,$(NDK_A_NAMES))) -L$(abspath $(NDK_BUILD_DIR)) $(foreach soname,$(NDK_SO_NAMES),-l:$(soname)))
$(info $(NDK_SO_NAMES))
$(info $(NDK_CXX_FLAG_$(LOCAL_MODULE)))
$(info End)
diff --git a/build-aux/ndk-build-helper-2.mk b/build-aux/ndk-build-helper-2.mk
index 697740b3d45..b8d22f5952d 100644
--- a/build-aux/ndk-build-helper-2.mk
+++ b/build-aux/ndk-build-helper-2.mk
@@ -29,7 +29,7 @@ NDK_CXX_FLAG_$(LOCAL_MODULE) :=
$(info Building $(build_kind))
$(info $(LOCAL_MODULE))
-$(info $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES$(EMACS_ABI))))
+$(info $(addprefix $(LOCAL_PATH:%/=%)/,$(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES$(EMACS_ABI))))
ifeq ($(filter-out lib%,$(LOCAL_MODULE)),)
NDK_A_NAMES = $(LOCAL_MODULE).a
@@ -99,7 +99,7 @@ endif
$(info $(foreach dir,$(NDK_INCLUDES),-I$(dir)))
$(info $(LOCAL_EXPORT_CFLAGS))
-$(info $(LOCAL_EXPORT_LDFLAGS) $(abspath $(addprefix $(NDK_BUILD_DIR)/,$(NDK_A_NAMES))) $(and $(NDK_SO_NAMES), -L$(abspath $(NDK_BUILD_DIR)) $(foreach soname,$(NDK_SO_NAMES),-l:$(soname))))
+$(info $(LOCAL_EXPORT_LDFLAGS) $(abspath $(addprefix $(NDK_BUILD_DIR:%/=%)/,$(NDK_A_NAMES))) $(and $(NDK_SO_NAMES), -L$(abspath $(NDK_BUILD_DIR)) $(foreach soname,$(NDK_SO_NAMES),-l:$(soname))))
$(info $(NDK_A_NAMES) $(NDK_SO_NAMES))
$(info $(NDK_CXX_FLAG_$(LOCAL_MODULE)))
$(info End)
diff --git a/build-aux/ndk-build-helper.mk b/build-aux/ndk-build-helper.mk
index 521e1b24ce3..b4746dd623f 100644
--- a/build-aux/ndk-build-helper.mk
+++ b/build-aux/ndk-build-helper.mk
@@ -42,7 +42,7 @@ EMACS_SRCDIR := $(absname $(EMACS_SRCDIR))
# my-dir is a function that returns the Android module directory. If
# no Android.mk has been loaded, use ANDROID_MODULE_DIRECTORY.
-my-dir = $(or $(and $(local-makefile),$(dir $(local-makefile))),$(ANDROID_MODULE_DIRECTORY))
+my-dir = $(patsubst %/,%,$(or $(and $(local-makefile),$(dir $(local-makefile))),$(ANDROID_MODULE_DIRECTORY)))
# Return all Android.mk files under the first arg.
all-makefiles-under = $(wildcard $(1)/*/Android.mk)
diff --git a/build-aux/ndk-module-extract.awk b/build-aux/ndk-module-extract.awk
index 6ff30973d67..b57bf74001d 100644
--- a/build-aux/ndk-module-extract.awk
+++ b/build-aux/ndk-module-extract.awk
@@ -55,14 +55,14 @@
/^End$/ {
if (name == MODULE && (kind == "shared" || kind == "static"))
{
- printf "module_name=%s\n", name
- printf "module_kind=%s\n", kind
- printf "module_src=\"%s\"\n", src
- printf "module_includes=\"%s\"\n", includes
- printf "module_cflags=\"%s\"\n", cflags
- printf "module_ldflags=\"%s\"\n", ldflags
- printf "module_target=\"%s\"\n", target
- printf "module_cxx_deps=\"%s\"\n", cxx_deps
+ printf "module_name=%s;", name
+ printf "module_kind=%s;", kind
+ printf "module_src=\"%s\";", src
+ printf "module_includes=\"%s\";", includes
+ printf "module_cflags=\"%s\";", cflags
+ printf "module_ldflags=\"%s\";", ldflags
+ printf "module_target=\"%s\";", target
+ printf "module_cxx_deps=\"%s\";", cxx_deps
}
src = ""
@@ -83,6 +83,6 @@
imports = ""
# Strip off leading whitespace.
gsub (/^[ \t]+/, "", makefile_imports)
- printf "module_imports=\"%s\"\n", makefile_imports
+ printf "module_imports=\"%s\";", makefile_imports
makefile_imports = ""
}
diff --git a/configure.ac b/configure.ac
index 93265594275..fb71a86a43e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,11 +197,17 @@ AS_IF([test "$XCONFIGURE" = "android"],[
AC_MSG_NOTICE([configuring in `exec'])
+ # Derive a name for a cache file for this configure script from the
+ # current, if specified.
+ exec_cache_file=
+ AS_CASE([$cache_file], [/dev/null | ""], [],
+ [[[\\/]* | ?:[\\/]*]], [exec_cache_file="--cache-file=$cache_file.2"],
+ [*], [exec_cache_file="--cache-file=../$cache_file.2"])
OLDCWD=`pwd`
cd exec
$CONFIG_SHELL $emacs_srcdir/exec/configure \
--host=$host "CC=$CC" "LD=$CC" "AS=$CC" \
- "AR=$AR" "CFLAGS=$CFLAGS"
+ "AR=$AR" "CFLAGS=$CFLAGS" $exec_cache_file
emacs_val=$?
cd $OLDCWD
@@ -1276,6 +1282,11 @@ packages targeting Android 2.2.])])
emacs_val="--enable-check-lisp-object-type=$enable_check_lisp_object_type"
passthrough="$passthrough $emacs_val"
+ # And derive a name for the recursive configure invocation's cache
+ # file if one should be specified for this.
+ AS_IF([test -n "$cache_file" && test "$cache_file" != "/dev/null"],
+ [passthrough="$passthrough --cache-file=$cache_file.1"])
+
AS_IF([test "x$with_mailutils" = "xyes"], [emacs_use_mailutils=yes])
AC_SUBST([emacs_use_mailutils])
@@ -1613,6 +1624,30 @@ AC_DEFUN([gl_TYPE_OFF64_T],
[HAVE_OFF64_T=1
AC_SUBST([HAVE_OFF64_T])])
+# `strnlen' cannot accept nlen greater than the size of the object S
+# on Android 5.0 and earlier.
+m4_define([ORIGINAL_AC_FUNC_STRNLEN], m4_defn([AC_FUNC_STRNLEN]))
+AC_DEFUN([AC_FUNC_STRNLEN], [
+AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_CACHE_CHECK([for strnlen capable of accepting large limits],
+ [emacs_cv_func_strnlen_working],
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [[
+ volatile size_t (*strnlen_pointer) (const char *s, size_t) = &strnlen;
+ if ((*strnlen_pointer) ("", -1) != 0)
+ return 1;
+ return 0;
+]])],[emacs_cv_func_strnlen_working=yes],
+ [emacs_cv_func_strnlen_working=no],
+ [# Guess no on Android 21 and earlier, yes elsewhere.
+ AS_IF([test -n "$ANDROID_SDK" && test "$ANDROID_SDK" -lt 22],
+ [emacs_cv_func_strnlen_working=no],
+ [emacs_cv_func_strnlen_working='guessing yes'])])])
+AS_IF([test "$emacs_cv_func_strnlen_working" != "no"],
+ [ORIGINAL_AC_FUNC_STRNLEN],
+ [ac_cv_func_strnlen_working=no
+ AC_LIBOBJ([strnlen])])])
+
# Initialize gnulib right after choosing the compiler.
dnl Amongst other things, this sets AR and ARFLAGS.
gl_EARLY
@@ -3146,7 +3181,7 @@ if test "${HAVE_W32}" = "yes"; then
NATIVE_IMAGE_API="yes (w32)"
W32_OBJ="$W32_OBJ w32image.o"
fi
- W32_LIBS="$W32_LIBS -lwinmm -lusp10 -lgdi32 -lcomdlg32"
+ W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32"
W32_RES_LINK="\$(EMACSRES)"
CLIENTRES="emacsclient.res"
@@ -3921,6 +3956,8 @@ if test "${with_dbus}" = "yes"; then
dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1.
dnl dbus_type_is_valid and dbus_validate_* have been introduced in
dnl D-Bus 1.5.12.
+ dnl dbus_message_set_allow_interactive_authorization was introduced
+ dnl in D-Bus 1.8.10.
OLD_LIBS=$LIBS
LIBS="$LIBS $DBUS_LIBS"
AC_CHECK_FUNCS([dbus_watch_get_unix_fd \
@@ -3928,7 +3965,8 @@ if test "${with_dbus}" = "yes"; then
dbus_validate_bus_name \
dbus_validate_path \
dbus_validate_interface \
- dbus_validate_member])
+ dbus_validate_member \
+ dbus_message_set_allow_interactive_authorization])
LIBS=$OLD_LIBS
DBUS_OBJ=dbusbind.o
fi
@@ -5963,7 +6001,7 @@ LIBS="$LIB_PTHREAD $LIB_MATH $LIBS"
AC_CHECK_FUNCS([accept4 fchdir gethostname \
getrusage get_current_dir_name \
lrand48 random rint tcdrain trunc \
-select getpagesize setlocale newlocale \
+select getpagesize newlocale \
getrlimit setrlimit shutdown \
pthread_sigmask strsignal setitimer \
sendto recvfrom getsockname getifaddrs freeifaddrs \
diff --git a/cross/ndk-build/Makefile.in b/cross/ndk-build/Makefile.in
index 0970a765b45..b5eac9bd089 100644
--- a/cross/ndk-build/Makefile.in
+++ b/cross/ndk-build/Makefile.in
@@ -79,7 +79,7 @@ local-makefile = $$(NDK_LAST_MAKEFILE)
# my-dir is a function that returns the Android module directory. If
# no Android.mk has been loaded, use the directory of the Makefile
# being included.
-my-dir = $$(or $$(and $$(local-makefile),$$(dir $$(local-makefile))),$(dir $(1)))
+my-dir = $$(patsubst %/,%,$$(or $$(and $$(local-makefile),$$(dir $$(local-makefile))),$(dir $(1))))
# Return all Android.mk files under the first arg.
all-makefiles-under = $$(wildcard $$(1)/*/Android.mk)
diff --git a/cross/ndk-build/ndk-resolve.mk b/cross/ndk-build/ndk-resolve.mk
index 896c29f7f90..289e3a8a003 100644
--- a/cross/ndk-build/ndk-resolve.mk
+++ b/cross/ndk-build/ndk-resolve.mk
@@ -50,7 +50,6 @@ ifeq ($$(filter $(1)$(and $(3),whole),$$(NDK_RESOLVED_CFLAGS_$(LOCAL_MODULE))),)
# Always mark this module's cflags as having been resolved, even if
# this is a whole library.
NDK_RESOLVED_CFLAGS_$(LOCAL_MODULE) += $(1)
-
NDK_CFLAGS_$(LOCAL_MODULE) += $(NDK_LOCAL_EXPORT_CFLAGS_$(1))
NDK_CFLAGS_$(LOCAL_MODULE) += $(addprefix -I,$(NDK_LOCAL_EXPORT_C_INCLUDES_$(1)))
endif
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index 7abb504632b..42c656ac852 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -4,155 +4,133 @@
@c See file emacs.texi for copying conditions.
@node Antinews
-@appendix Emacs 28 Antinews
+@appendix Emacs 29 Antinews
@c Update the emacs.texi Antinews menu entry with the above version number.
For those users who live backwards in time, here is information
-about downgrading to Emacs version 28.2. We hope you will enjoy the
+about downgrading to Emacs version 29.4. We hope you will enjoy the
greater simplicity that results from the absence of many @w{Emacs
@value{EMACSVER}} features.
@itemize @bullet
@item
-Like its newer releases, Emacs 28 can still be built with support of
+Emacs can no longer be built for Android mobile devices. We have
+removed the Android support because it was deemed unnecessary, what with
+the screens of the mobile devices becoming smaller and smaller as you
+move back in time. We expect Android users to enjoy the much simpler
+text editors available on their devices. As a nice bonus, removing
+Android support allowed us to get rid of gobs of related files, thus
+making the release tarballs much leaner.
+
+@item
+We have deleted much of the enhanced support for touchscreen devices,
+for the same reason we dropped Android: there will be no need for that
+as you move back in time.
+
+@item
+We also dropped support for sophisticated input methods that include
+text conversions, again because those are mostly needed on mobile and
+hand-held devices, which we gradually remove from Emacs in each past
+version.
+
+@item
+Like its newer releases, Emacs 29 can still be built with support of
native compilation of Lisp programs. However, in preparation for
-removal of this feature in some previous version, we've deleted the
-capability of ahead-of-time native compilation of all the Lisp files
-that come with Emacs. This makes the Emacs build process much faster.
+removal of this feature in some previous version, we've made the native
+compiler support off by default; you will now have to request it
+explicitly at configure time. This makes the default Emacs build
+process much faster.
@item
-Emacs can no longer be built with the tree-sitter library, so you no
-longer will need to look for and install the grammar libraries for
-the languages in which you want to program. Similarly, all the modes
-that are based on the tree-sitter library were deleted, leaving you
-with just one major mode for every supported programming language: no
-more need to decide whether to turn the tree-sitter supported modes on
-and try using their parser-based fontification, indentation, and other
-features. For some languages and file types, this means no major mode
-at all, leaving you with the venerable Fundamental mode as the
-natural, high-performance choice. For example, Go, Rust, and CMake
-files no longer have any major modes for editing their files ---
-another milestone towards a simpler, leaner Emacs.
+JSON interfaces are slowly move into oblivion as past years come closer,
+so we have removed our internal implementation of JSON; you will now
+need to build Emacs with the libjansson library, if you need JSON.
+Eventually, we plan on removing JSON support from Emacs altogether; this
+move will make the removal much simpler.
@item
-Built-in support for accessing SQLite databases was removed. You can
-now again edit SQLite files as simple binary files, which Emacs is
-quite capable to support, as it always did.
+Tree-sitter based modes are now completely independent of their
+non-Tree-Sitter counterparts. We decided that keeping the settings
+separate and independent goes a long way toward simplicity, which is one
+of our main motivation for removing stuff from Emacs.
@item
-As a gesture to users of the Haiku operating system, we've dropped the
-code which allowed Emacs to be built on that OS@. We expect Haiku
-users to enjoy the much simpler editors they have for editing their
-files.
+Various Help commands no longer turn on Outline minor mode. With less
+material to display in the *Help* buffers, due to removing of excess
+documentation from Emacs, we think using outlining is an unnecessary
+complication, as scrolling through plain text is so much simpler.
+
+For the same reasons, Emacs no longer shows Unicode names of characters
+in *Help* buffers shown by @code{describe-bindings}.
@item
-Support for XInput2 input events on X is gone. We think the
-traditional X input events are more than enough, certainly so as you
-move back in time, where XInput2 will eventually be removed from X as
-well, once the maintainers of the X Windows system realize the utter
-futility of supporting fancy input mechanisms.
+To make Emacs configuration simpler and easier to control, the tool bar
+can now be displayed only in its natural and logical position: on the
+top of the frame; no more of that @code{tool-bar-position} nonsense with
+tool bars on the bottom. For the same reasons @code{modifier-bar-mode}
+is now gone.
@item
-The ``pure GTK'' (a.k.a.@: @acronym{PGTK}) configuration of Emacs is
-no longer supported. This is in anticipation of the complete removal
-of the GTK toolkit support from Emacs, and in accordance with our
-expectation that GTK will cease to exist as you move back in time. We
-plan on removing support for all the other toolkits as well, leaving
-only the pure X build with our own widgets as the single supported GUI
-configuration on X.
+The command @code{recover-file} no longer allows to display the diffs
+between a file and its auto-save file. You either want to recover a
+file or you don't; confusing users with a third alternative when they
+are anxious already by the possibility of losing precious edits is
+considered a bad idea, certainly so as we move further towards smaller,
+simpler Emacs.
@item
-The @option{--init-directory} command-line option was removed, as
-initializing Emacs with init files of another user is a preposterous
-idea anyway.
+Several languages and input methods, which will fall in disuse as you
+move back in time, were removed. This includes Urdu, Pashto, and Sindhi
+languages, and the input method for the Colemak keyboard layout. Many
+@kbd{C-x 8} key sequences, including those which insert various
+quotation characters and guillemets, were deleted for the same reason.
@item
-In line with simplifying and eventually removing the
-native-compilation option, we've deleted the
-@option{--with-native-compilation=aot} configure-time option. This
-greatly simplifies how native compilation works and makes your
-configure-time decision regarding native compilation in Emacs
-clear-cut: either Emacs compiles non-preloaded Lisp packages to native
-code only before using it, or it never uses native compilation at all;
-no more half measures and special exceptions. For similar reasons,
-@code{native-compile-prune-cache} and
-@code{startup-redirect-eln-cache} features are no longer part of
-Emacs.
+The support for @code{lzip}-compressed Info manuals was removed from the
+Info mode. We anticipate that @command{lzip} will disappear from the
+face of the Earth in the near past, and are preparing Emacs for that in
+advance.
@item
-We've deleted the special code and features which allowed Emacs to
-present decent performance and responsiveness when editing files with
-very long lines. Such files become more and more rare as time goes
-back, and so having all this tricky code in Emacs for their benefit
-was deemed an unnecessary complication.
+Support for LLDB in Grand Unified Debugger mode was dropped. We decided
+that given LLDB's diminishing popularity, its support is just code
+bloat.
@item
-Emacs dropped support for Eglot and the LSP servers. We decided that
-the built-in ways of analyzing source code are more than enough as you
-move back in time.
+Several fancy Project and VC commands were deleted, as part of our
+consistent effort of making Emacs simpler to use.
@item
-Commands to scale and rotate images are once again bound to single
-keys like @kbd{+}, @kbd{-}, and @kbd{r}, which makes them much easier
-to type. As for the risk of typing these by mistake, we don't believe
-Emacs users make typing mistakes, especially as they move back in
-time and become younger and younger.
+The user option @code{shell-command-guess-functions} and the context
+menu @samp{Open With} in Dired are gone. We trust Emacs users to always
+know themselves which shell command is the appropriate one for a given
+file, so no guessing by Dired is needed, or welcome. The
+@code{dired-do-open} command was deleted for the same reasons.
@item
-To simplify typing popular commands, we've rebound the @w{@kbd{C-x 8 . .}}
-back to @w{@kbd{C-x 8 .}} and @w{@kbd{C-x 8 = =}} back to @w{@kbd{C-x 8 =}}.
-There's no need for fancier, longer key sequences, as moving back in
-time means we will have fewer and fewer commands to bind to them in
-the first place.
+We went back to the original lean-and-mean interface for specifying
+registers for register-related commands. The fancy preview and the
+options to go with it were deemed gratuitous and were removed.
@item
-If you inadvertently kill the @file{*scratch*} buffer, Emacs will
-recreate it in Fundamental mode, not in Lisp Interaction mode. You
-get to turn on the mode you like yourself. Our long-term plans for
-past Emacs releases is to remove the recreation of @file{*scratch*}
-altogether, and this is the first step in that direction.
+Eshell is now much smaller and easier to use, due to dropping quite a
+few of the new commands and fancy new options.
@item
-Support for @code{rlogin} and @code{rsh} protocols are back, since we
-expect them to become more and more important and popular as you move
-back in time.
+The command @code{customize-dirlocals} was removed. Editing the
+@file{.dir-locals.el} files as plain text is so much simpler, and quite
+enough.
@item
-In preparation for eventual removal of Unicode support from Emacs,
-we've downgraded our Unicode support to version 14.0.
+We have removed several packages that we consider unnecessary for the
+past of Emacs. This includes EditorConfig support, @samp{which-key},
+PEG, and Window-Tool-Bar.
@item
-You can no longer change the size of the font globally. Since Emacs
-will at some past date remove all support for variable-size fonts,
-having such commands is a luxury we are better without.
-
-@item
-On our permanent quest for simplifying Emacs, we've removed the
-commands @code{duplicate-line} and @code{duplicate-dwim}; the old-time
-friends @kbd{M-w} and @kbd{C-y} (typed one or more times) should
-suffice. The command @code{rename-visited-file} is gone for the same
-reason.
-
-@item
-We've deleted many commands related to Emoji, which were bound in the
-@kbd{C-x 8 e} prefix keymap. We decided that the ability to type
-Emoji sequences using @kbd{C-x 8 @key{RET}} is enough, and actually
-serves our users better by requiring them to know the codepoints of
-the sequences they want to type.
-
-@item
-We dropped support for many scripts and input methods, especially old
-scripts that no one uses anyway. For similar reasons, Greek and
-Ukrainian translations of the Emacs tutorial are not available
-anymore.
-
-@item
-@file{package.el} can no longer fetch source code of packages from
-their VCS repositories. We think command-line tools like Git should
-be enough to allow you to clone their repositories. So we deleted
-the @code{package-vc-install} command and other similar commands.
+The @code{etags-regen-mode} was deleted. Regeneration of @file{TAGS}
+tables manually is all Emacs users will need in the past.
@item
To keep up with decreasing computer memory capacity and disk space, many
-other functions and files have been eliminated in Emacs 28.2.
+other functions and files have been eliminated in Emacs 29.4.
@end itemize
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index a2a934ff243..42f5c971e2f 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -643,14 +643,11 @@ long, by using Auto Fill mode. @xref{Filling}.
Normally, the first character of each continuation line is
positioned at the beginning of the screen line where it is displayed.
The minor mode @code{visual-wrap-prefix-mode} and its global
-(@pxref{Minor Modes}) counterpart
-@code{global-visual-wrap-prefix-mode} arranges that continuation lines
-be prefixed by slightly adjusted versions of the fill prefixes
-(@pxref{Fill Prefix}) of their respective logical lines, so that
-indentation characters or the prefixes of source code comments are
-replicated across every continuation line, and the appearance of such
-comments or indentation is not broken. These prefixes are only shown
-on display, and does not change the buffer text in any way.
+counterpart (@pxref{Minor Modes}) @code{global-visual-wrap-prefix-mode}
+arranges for continuation lines to be indented on display using a fill
+prefix (@pxref{Fill Prefix}) automatically computed from each line's
+surrounding context. These prefixes are display-only feature, and do
+not change the buffer text in any way.
Sometimes, you may need to edit files containing many long logical
lines, and it may not be practical to break them all up by adding
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 2786ff6ad65..eba593f0ec9 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -313,6 +313,8 @@ Kill buffer @var{buffer} (@code{kill-buffer}).
Offer to kill each buffer, one by one.
@item M-x kill-matching-buffers
Offer to kill all buffers matching a regular expression.
+@item M-x kill-matching-buffers-no-ask
+Like @code{kill-matching-buffers}, but don't ask for confirmation.
@end table
@findex kill-buffer
@@ -334,13 +336,16 @@ by one. An answer of @kbd{yes} means to kill the buffer, just like
with a space, which are used internally by Emacs.
@findex kill-matching-buffers
+@findex kill-matching-buffers-no-ask
The command @kbd{M-x kill-matching-buffers} prompts for a regular
expression and kills all buffers whose names match that expression.
-@xref{Regexps}. Like @code{kill-some-buffers}, it asks for
-confirmation before each kill. This command normally ignores buffers
-whose names begin with a space, which are used internally by Emacs.
-To kill internal buffers as well, call @code{kill-matching-buffers}
-with a prefix argument.
+@xref{Regexps}. Like @code{kill-some-buffers}, it asks for confirmation
+before each kill. This command normally ignores buffers whose names
+begin with a space, which are used internally by Emacs. To kill
+internal buffers as well, call @code{kill-matching-buffers} with a
+prefix argument. The command @w{@kbd{M-x kill-matching-buffers-no-ask}}
+works like @code{kill-matching-buffers}, but doesn't ask for
+confirmation before killing each matching buffer.
The Buffer Menu feature is also convenient for killing various
buffers. @xref{Several Buffers}.
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 38cc0bb67af..1b079c2cef9 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -477,6 +477,14 @@ non-@code{nil} if the buffer is to be saved). Any other
non-@code{nil} value means that all buffers should be saved without
asking. The default is @code{ask}.
+@vindex grep-use-headings
+@vindex grep-heading@r{ face}
+ By default, grep matches are shown with the file names prefixed to
+each line. But if the variable @code{grep-use-headings} is customized
+to a non-@code{nil} value, the matches are split into sections, one
+section for each file with matches, and the file names are shown in the
+section headings using a special face @code{grep-heading}.
+
@findex grep-find
@findex find-grep
The command @kbd{M-x grep-find} (also available as @kbd{M-x
@@ -1313,6 +1321,10 @@ of output to its standard output, you may wish to separate its I/O
from interaction with GDB. Use the command @w{@kbd{M-x
gdb-display-io-buffer}} to show a window with a buffer to which Emacs
redirects the input and output from the program you are debugging.
+However, if the variable @code{gdb-display-io-buffer} is @code{nil},
+Emacs will not create nor display a separate I/O buffer, but will
+instead redirect the program's interaction to the GUD interaction
+buffer.
@findex gdb-display-registers-buffer
@item Registers Buffer
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index c251a6dc2be..cf57350743f 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -803,9 +803,9 @@ The @code{dired-keep-marker-copy} user option controls how this
command handles file marking. The default is to mark all new copies
of files with a @samp{C} mark.
-@item D
@findex dired-do-delete
@kindex D @r{(Dired)}
+@item D
Delete the specified files (@code{dired-do-delete}). This is like the
shell command @code{rm}.
@@ -813,6 +813,13 @@ Like the other commands in this section, this command operates on the
@emph{marked} files, or the next @var{n} files. By contrast, @kbd{x}
(@code{dired-do-flagged-delete}) deletes all @dfn{flagged} files.
+@findex dired-do-open
+@kindex E @r{(Dired)}
+@item E
+``Open'' the specified files using an external program. The program is
+selected according to the system conventions, as determined by the
+variable @code{shell-command-guess-open}.
+
@findex dired-do-rename
@kindex R @r{(Dired)}
@cindex renaming files (in Dired)
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index cdc92679fcb..8776d358373 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -220,7 +220,7 @@ Appendices
* GNU Free Documentation License:: The license for this documentation.
* Emacs Invocation:: Hairy startup options.
* X Resources:: X resources for customizing Emacs.
-* Antinews:: Information about Emacs version 28.
+* Antinews:: Information about Emacs version 29.
* Mac OS / GNUstep:: Using Emacs under macOS and GNUstep.
* Haiku:: Using Emacs on Haiku.
* Android:: Using Emacs on Android.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index dfacf501650..709cb0910e6 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1633,8 +1633,8 @@ commands to visit the corresponding source locations.
manipulate and apply parts of patches:
@table @kbd
-@item M-n
@findex diff-hunk-next
+@item M-n
Move to the next hunk-start (@code{diff-hunk-next}). With prefix
argument @var{n}, move forward to the @var{n}th next hunk.
@@ -1645,45 +1645,50 @@ you set @code{diff-refine} to the symbol @code{navigation}, Diff mode
only refines the hunk you move to with this command or with
@code{diff-hunk-prev}.
-@item M-p
@findex diff-hunk-prev
+@item M-p
Move to the previous hunk-start (@code{diff-hunk-prev}). With prefix
argument @var{n}, move back to the @var{n}th previous hunk. Like
@kbd{M-n}, this command refines the hunk you move to if you set
@code{diff-refine} to the symbol @code{navigation}.
-@item M-@}
@findex diff-file-next
+@item M-@}
Move to the next file-start, in a multi-file patch
(@code{diff-file-next}). With prefix argument @var{n}, move forward
to the start of the @var{n}th next file.
-@item M-@{
@findex diff-file-prev
+@item M-@{
Move to the previous file-start, in a multi-file patch
(@code{diff-file-prev}). With prefix argument @var{n}, move back to
the start of the @var{n}th previous file.
-@item M-k
@findex diff-hunk-kill
+@item M-k
Kill the hunk at point (@code{diff-hunk-kill}).
-@item M-K
@findex diff-file-kill
+@item M-K
In a multi-file patch, kill the current file part.
(@code{diff-file-kill}).
-@item C-c C-a
@findex diff-apply-hunk
@cindex patches, applying
+@item C-c C-a
Apply this hunk to its target file (@code{diff-apply-hunk}). With a
prefix argument of @kbd{C-u}, revert this hunk, i.e.@: apply the
reverse of the hunk, which changes the ``new'' version into the ``old''
version. If @code{diff-jump-to-old-file} is non-@code{nil}, apply the
hunk to the ``old'' version of the file instead.
-@item C-c C-b
+@findex diff-apply-buffer
+@item C-c @key{RET} a
+Apply all the hunks in the buffer (@code{diff-apply-buffer}). If the
+diffs were applied successfully, save the changed buffers.
+
@findex diff-refine-hunk
+@item C-c C-b
Highlight the changes of the hunk at point with a finer granularity
(@code{diff-refine-hunk}). This allows you to see exactly which parts
of each changed line were actually changed.
@@ -1693,9 +1698,9 @@ By default, Diff mode refines hunks as Emacs displays them, so you may
find this command useful if you customize @code{diff-refine} to a
non-default value.
-@item C-c C-c
@findex diff-goto-source
@vindex diff-jump-to-old-file
+@item C-c C-c
Go to the source file and line corresponding to this hunk
(@code{diff-goto-source}). By default, this jumps to the ``new''
version of the file, the one shown first on the file header.
@@ -1710,20 +1715,20 @@ this jumps to the work file by default. With a prefix argument, jump
to the ``old'' revision of the file (@pxref{Old Revisions}), when
point is on the old line, or otherwise jump to the ``new'' revision.
-@item C-c C-e
@findex diff-ediff-patch
+@item C-c C-e
Start an Ediff session with the patch (@code{diff-ediff-patch}).
@xref{Top, Ediff, Ediff, ediff, The Ediff Manual}.
-@item C-c C-n
@findex diff-restrict-view
+@item C-c C-n
Restrict the view to the current hunk (@code{diff-restrict-view}).
@xref{Narrowing}. With a prefix argument, restrict the
view to the current file of a multiple-file patch. To widen again,
use @kbd{C-x n w} (@code{widen}).
-@item C-c C-r
@findex diff-reverse-direction
+@item C-c C-r
Reverse the direction of comparison for the entire buffer
(@code{diff-reverse-direction}). With a prefix argument, reverse the
direction only inside the current region (@pxref{Mark}). Reversing
@@ -1731,8 +1736,8 @@ the direction means changing the hunks and the file-start headers to
produce a patch that would change the ``new'' version into the ``old''
one.
-@item C-c C-s
@findex diff-split-hunk
+@item C-c C-s
Split the hunk at point (@code{diff-split-hunk}) into two separate
hunks. This inserts a hunk header and modifies the header of the
current hunk. This command is useful for manually editing patches,
@@ -1743,35 +1748,35 @@ produced by the @option{-c} or @option{--context} options to
@command{diff}, first convert the buffer to the unified diff format
with @kbd{C-c C-u}.
-@item C-c C-d
@findex diff-unified->context
+@item C-c C-d
Convert the entire buffer to the @dfn{context diff format}
(@code{diff-unified->context}). With a prefix argument, convert only
the hunks within the region.
-@item C-c C-u
@findex diff-context->unified
+@item C-c C-u
Convert the entire buffer to unified diff format
(@code{diff-context->unified}). With a prefix argument, convert
unified format to context format. When the mark is active, convert
only the hunks within the region.
-@item C-c C-l
@findex diff-refresh-hunk
+@item C-c C-l
Re-generate the current hunk (@code{diff-refresh-hunk}).
-@item C-c C-w
@vindex diff-ignore-whitespace-switches
@findex diff-ignore-whitespace-hunk
+@item C-c C-w
Re-generate the current hunk, disregarding changes in whitespace.
With a non-@code{nil} prefix arg, re-generate all the hunks
(@code{diff-ignore-whitespace-hunk}). This calls @code{diff-command}
with @code{diff-ignore-whitespace-switches}, which defaults to
@samp{-b}, meaning ignore changes in whitespace only.
-@item C-x 4 A
@findex diff-add-change-log-entries-other-window
@findex add-change-log-entry-other-window@r{, in Diff mode}
+@item C-x 4 A
Generate a ChangeLog entry, like @kbd{C-x 4 a} does (@pxref{Change
Log}), for each one of the hunks
(@code{diff-add-change-log-entries-other-window}). This creates a
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index f3c876cf3f7..af9ca5fcdf6 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -473,6 +473,13 @@ it will slow down cursor motion and scrolling commands. It also
doesn't automatically check the text you didn't type or move across;
use @code{flyspell-region} or @code{flyspell-buffer} for that.
+@vindex flyspell-check-changes
+ Normally, Flyspell mode highlights misspelled words that you typed or
+modified, but also words you move across without changing them. But if
+you customize the variable @code{flyspell-check-changes} to a
+non-@code{nil} value, Flyspell mode will check only the words you typed
+or edited in some way.
+
@findex flyspell-correct-word
@findex flyspell-auto-correct-word
@findex flyspell-correct-word-before-point
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 57adc037cb7..62f72763ac6 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -302,6 +302,13 @@ a pure white space string to the kill ring, you can say:
non-@code{nil} value, identical subsequent kills yield a single
kill-ring entry, without duplication.
+@findex kill-ring-deindent-mode
+ If you enable the minor mode @code{kill-ring-deindent-mode}, text
+saved to the kill-ring will have its indentation decreased by the amount
+of indentation of the first saved line. That is, if the first line of
+the saved text was indented @var{n} columns, this mode will remove that
+number of columns from the indentation of each saved line.
+
@node Yanking
@section Yanking
@cindex moving text
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 3a9bef9884a..f4752fa2b29 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1850,6 +1850,9 @@ Run shell command in the current project's root directory
@item C-x p &
Run shell command asynchronously in the current project's root
directory (@code{project-async-shell-command}).
+@item C-x p o
+Run the next command in the current project
+(@code{project-any-command}).
@end table
Emacs provides commands for handling project files conveniently.
@@ -1946,6 +1949,11 @@ directory. @xref{Top,Eshell,Eshell, eshell, Eshell: The Emacs Shell}.
The command @kbd{C-x p &} (@code{project-async-shell-command}) runs
@code{async-shell-command} in the current project's root directory.
+@findex project-any-command
+ Finally, the command @kbd{C-x p o} (@code{project-any-command}) will
+run the next command you type, whether related to files or not, in the
+current project.
+
@node Project Buffer Commands
@subsection Project Commands That Operate on Buffers
@@ -1958,6 +1966,9 @@ List the project buffers (@code{project-list-buffers}).
@item C-x p k
Kill all live buffers that belong to the current project
(@code{project-kill-buffers}).
+@item C-x p o
+Run the next command in the current project
+(@code{project-any-command}).
@end table
@findex project-switch-to-buffer
@@ -1986,6 +1997,10 @@ project that satisfy any of @code{project-kill-buffer-conditions}. If
@code{project-kill-buffers-display-buffer-list} is non-@code{nil}, the
buffers to be killed will be displayed first.
+ Finally, the command @kbd{C-x p o} (@code{project-any-command}) will
+run the next command you type, whether related to buffers or not, in the
+current project.
+
@node Switching Projects
@subsection Switching Projects
@@ -2466,10 +2481,10 @@ the match with @var{replacement}. This command can only be used in
@file{*xref*} buffers that show all the matches for an identifier in
all the relevant files. @xref{Identifier Search}.
+@cindex revert-buffer, in @file{*xref*} buffers
@item g
-@findex xref-revert-buffer
-Refresh the contents of the @file{*xref*} buffer
-(@code{xref-revert-buffer}).
+Refresh the contents of the @file{*xref*} buffer (@code{revert-buffer}).
+@xref{Reverting}.
@item M-,
@findex xref-quit-and-pop-marker-stack
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 4557f41c3f7..79744967455 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -452,6 +452,15 @@ While in the completion list buffer, kill it and delete the window
showing it (@code{kill-current-buffer}).
@end table
+@vindex minibuffer-visible-completions
+ If the variable @code{minibuffer-visible-completions} is customized to
+a non-@code{nil} value, it changes the commands bound to the arrow keys:
+instead of moving in the minibuffer, they move between completion
+candidates, like meta-arrow keys do by default. Similarly,
+@kbd{@key{RET}} selects the current candidate, like @kbd{M-@key{RET}}
+does normally. @code{C-g} hides the completion window, but leaves the
+minibuffer active, so you can continue typing at the prompt.
+
@node Completion Exit
@subsection Completion Exit
@@ -685,6 +694,17 @@ then move to a candidate by cursor motion commands and select it with
@code{second-tab}, then the first @kbd{@key{TAB}} will pop up the
completions list buffer, and the second one will switch to it.
+@findex previous-line-completion
+@findex next-line-completion
+@vindex completion-auto-wrap
+ When the window showing the completions is selected, either because
+you customized @code{completion-auto-select} or because you switched to
+it by typing @kbd{C-x o}, the @kbd{@key{UP}} and @kbd{@key{DOWN}} arrow
+keys move by lines between completion candidates; with a prefix numeric
+argument, they move that many lines. If @code{completion-auto-wrap} is
+non-@code{nil}, these commands will wrap at bottom and top of the
+candidate list.
+
@vindex completion-cycle-threshold
If @code{completion-cycle-threshold} is non-@code{nil}, completion
commands can cycle through completion alternatives. Normally, if
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 13d86a32e79..d1e8217f579 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2849,13 +2849,14 @@ frame parameters you don't want to be restored; they will then be set
according to your customizations in the init file.
@vindex desktop-files-not-to-save
-@vindex remote-file-name-access-timeout
+@vindex remote-file-name-access-timeout@r{, and desktop restoring}
Information about buffers visiting remote files is not saved by
default. Customize the variable @code{desktop-files-not-to-save} to
change this. In this case, you might also consider customizing
@code{remote-file-name-access-timeout}, which is the number of
seconds after which buffer restoration of a remote file is
-stopped. This prevents Emacs being blocked.
+stopped. This prevents Emacs from being blocked when restoring sessions
+that visited remote files.
@vindex desktop-restore-eager
By default, all the buffers in the desktop are restored in one go.
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 1d1065c45c2..8abaeafcf33 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1208,6 +1208,12 @@ Hide everything except the top @var{n} levels of heading lines
Hide everything except for the heading or body that point is in, plus
the headings leading up from there to the top level of the outline
(@code{outline-hide-other}).
+@item C-c / h @var{regexp} @key{RET}
+Hide bodies of headings that match @var{regexp}
+(@code{outline-hide-by-heading-regexp}).
+@item C-c / s @var{regexp} @key{RET}
+Show bodies of headings that match @var{regexp}
+(@code{outline-show-by-heading-regexp}).
@end table
@findex outline-hide-entry
@@ -1253,6 +1259,16 @@ headers leading up from there to top level in the outline) and the top
level headings. It also reveals body lines preceding the first
heading in the buffer.
+@findex outline-hide-by-heading-regexp
+@findex outline-show-by-heading-regexp
+@kindex C-c / h @r{(Outline mode)}
+@kindex C-c / s @r{(Outline mode)}
+ The command @kbd{C-c / h} (@code{outline-hide-by-heading-regexp})
+prompts for a regular expression, and hides all the body lines of
+headings which match the regular expression. The command @kbd{C-c / s}
+likewise prompts for a regular expression, and reveals the bodies of
+matching headings.
+
@findex outline-hide-body
@findex outline-show-all
@kindex C-c C-t @r{(Outline mode)}
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 5ad6850fed9..60599d42020 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -300,7 +300,8 @@ Make selected window narrower (@code{shrink-window-horizontally}).
Shrink this window if its buffer doesn't need so many lines
(@code{shrink-window-if-larger-than-buffer}).
@item C-x +
-Make all windows the same height (@code{balance-windows}).
+Balance the sizes of all the windows of the selected frame
+(@code{balance-windows}).
@end table
@kindex C-x 0
@@ -373,8 +374,11 @@ lines to other windows in the frame.
@kindex C-x +
@findex balance-windows
- You can also use @kbd{C-x +} (@code{balance-windows}) to even out the
-heights of all the windows in the selected frame.
+ You can also use @kbd{C-x +} (@code{balance-windows}) to balance the
+sizes of all the windows of the selected frame (with the exception of
+the minibuffer window, @pxref{Minibuffer}). This command makes each
+horizontal pair of adjacent windows the same height, and each vertical
+pair of adjacent windows the same width.
@node Displaying Buffers
@section Displaying a Buffer in a Window
diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1
index ee8f418414c..e2d4c019b4a 100644
--- a/doc/lispref/ChangeLog.1
+++ b/doc/lispref/ChangeLog.1
@@ -4890,7 +4890,7 @@
2011-05-10 Jim Meyering
- * minibuf.texi: Fix typo "in in -> in".
+ * minibuf.texi: Fix typo.
2011-05-06 Paul Eggert
diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi
index 0cb956eea98..8dba137ca31 100644
--- a/doc/lispref/anti.texi
+++ b/doc/lispref/anti.texi
@@ -6,178 +6,113 @@
@c This node must have no pointers.
@node Antinews
-@appendix Emacs 28 Antinews
+@appendix Emacs 29 Antinews
@c Update the elisp.texi Antinews menu entry with the above version number.
For those users who live backwards in time, here is information about
-downgrading to Emacs version 28.2. We hope you will enjoy the greater
+downgrading to Emacs version 29.4. We hope you will enjoy the greater
simplicity that results from the absence of many @w{Emacs
@value{EMACSVER}} features.
@itemize @bullet
@item
-The implementation of overlays is back to its simple, time-proven
-storage in a pair of linear linked lists centered around some buffer
-position. No more fancy interval trees and suchlikes. Lisp programs
-that use overlays once again need to recenter overlays around the
-buffer position of interest, and display-related features should again
-make sure they don't use too many overlays in a buffer, lest redisplay
-will be too slow.
+Mouse wheel events once again follow the platform and window-system
+conventions: sometimes they are @code{wheel-up/down} and sometimes
+@code{mouse-4/5/6/7}. Lisp programs which use these should once again
+be aware of the conventions in effect and behave accordingly.
@item
-Several functions stopped the annoying conversion of quotes and key
-sequences by no longer calling @code{substitute-command-keys}. One
-prominent example is @code{format-prompt} and all its many callers.
-This makes the strings they produce much more predictable, returning
-to you, the Lisp programmer, control on which punctuation characters
-will appear in the text presented to the users. For similar reasons,
-the @code{substitute-quotes} function was deleted.
+The command @code{describe-function} no longer distracts you by showing
+unnecessary details like the type of the function's object. Emacs
+hackers always know whether a function is a primitive, a native-compiled
+Lisp function, or any other kind. Stating the obvious simply wastes the
+precious screen estate; as you move into the past, and the typical
+dimensions of the screen become smaller, that waste is less and less
+justified. So we made the waste smaller.
@item
-The venerable @code{buffer-modified-p} function again reliably returns
-either @code{nil} or @code{t}, not any other confusing values.
+The support for styled underline in face attribute was dropped. The
+simple underline should be enough; anything else is just code bloat and
+creeping featurism. Colorful underlines on TTY frames are no longer
+supported for the same reason.
@item
-The support for @samp{medium} weight of fonts was dropped. Emacs now
-considers @samp{medium} and @samp{regular} weights to be the same. We
-believe this will simplify your font setup, since there's no longer a
-need to worry about fonts that support @samp{regular} weight, but not
-the @samp{medium} one, or vice versa: either one will do!
+IELM stopped recording its input history. You will no longer be annoyed
+by inputs from your past sessions; each session starts with a clean
+slate. What can be simpler and easier to remember?
@item
-To reduce the amount of code in Emacs related to unimportant features,
-we've removed the function @code{compiled-function-p}. Lisp programs
-are expected to test explicitly for the relevant types of function
-objects: built-in, byte-compiled, and natively-compiled. For the same
-reasons we deleted the functions @code{pos-bol}, @code{pos-eol},
-@code{file-attribute-file-identifier}, and quite a few others. We
-don't expect anyone to miss those fancy functions.
+You can no longer disable JavaScript in xwidget Webkit sessions. Since
+xwidgets are going away in one of the previous Emacs versions, we
+decided to make this one step in that direction and get rid of this
+complication.
@item
-The timeout used by @code{x-show-tip} can no longer be specified by
-Lisp programs; it is hard-coded in the function. This will lead to a
-simpler, easier maintained code, and no one should want to control the
-timeout after which the tip pops down.
+The @code{minibuffer-regexp-mode} was removed. Regular expressions are
+just strings, so no fancy mode should be needed for editing them.
@item
-The macro @code{setopt} was deleted; use @code{customize-variable}
-instead, or invoke the @code{:set} function from Lisp.
+We removed the Compat package. Forward compatibility for ELPA packages
+becomes less and less important as you move back through time, and soon
+enough ELPA will disappear entirely. We decided it was prudent to start
+preparing for that now.
@item
-We removed the @code{lisp-directory} variable, as the value can be
-easily deduced from other similar variables, like
-@code{installation-directory} and @code{source-directory}, each one
-when it's relevant.
+We are back to interpreting @code{\x} without any following hex digits
+as character code zero (@acronym{NUL}), as it always was in Emacs. The
+savings in typing due to this alone are enough to justify this
+simplification.
@item
-To simplify code and reduce complexity, we deleted the functions
-@code{get-display-property} and @code{add-display-text-property}; use
-the generic @code{get-text-property} and @code{put-text-property}
-instead.
+To keep Emacs clean and elegant, we've removed the ability to show
+tooltips for fringe bitmaps. What important information cam be shown on
+the fringes, and why would it require tooltips to explain its purpose?
+We decided it isn't justified to keep this in past versions of Emacs.
@item
-Support for pinch input events and for modern drag-and-drop
-functionality on X was dropped. As you move back in time, these
-facilities will become less and less important, and will soon enough
-disappear, so there's no reason to keep them in Emacs.
+Fancy sorting-related facilities, like the @code{value<} function and
+keyword arguments for @code{sort}, were deleted as too complex. The
+basic @code{sort} function should all that's needed in the years to go.
@item
-To keep Emacs clean and elegant, we've removed the @file{textsec.el}
-library, with its facilities for checking whether some text is
-``suspicious''. We consider our users smart enough to detect
-maliciously modified text by just looking at it or by moving the
-cursor across it, and the whole idea that someone would wish to
-deliberately deceive Emacs users ridiculous and unworthy of
-complicating our elegant text-processing and display capabilities.
+Features related to the inheritance graph of major modes were deemed
+unnecessary and thus were dropped. This includes
+@code{provided-mode-derived-p}, @code{derived-mode-add-parents}, and
+others. We decided that untangling the mode inheritance relationships
+by hand facilitates more clear code and makes the intent evident.
@item
-The functions @code{keymap-set}, @code{keymap-global-set},
-@code{keymap-local-set}, @code{keymap-substitute},
-@code{keymap-lookup}, and some others were deleted. We have found the
-traditional @code{define-key}, @code{global-set-key},
-@code{local-set-key}, @code{substitute-key-definition}, and
-@code{key-binding} more than enough, and their minor inconsistencies
-in the syntax of keys they accept a source of endless fun in Emacs
-Lisp programming. Why make Emacs programming a dull place? For the
-same reasons we deleted @code{key-valid-p}, since we consider the
-permissive nature of @code{kbd} more in the spirit of Emacs Lisp.
+We removed unnecessary functionality for handling touch screen events,
+as touch screens gradually disappear from view as you move back in time.
+There's no need to keep obsolete these new inventions in the past.
@item
-Yanking of anything but plain text from other applications becomes
-more and more an unnecessary feature as you move back in time, so we
-dropped support for pasting media like HTML and images via the
-clipboard. If you @i{really} need to yank those into an Emacs buffer,
-you can go via a disk file.
+Various new functions and variables for moving and transposing sexps and
+for moving by program statements were dropped as unnecessary. The
+original commands that move by balanced expressions are more than
+enough.
@item
-We removed unnecessary functions @code{string-pixel-width} and
-@code{string-glyph-split}, as we consider it inappropriate for Lisp
-programs to do display layout calculations, where these functions come
-in handy. Display is for the display engine, written in C, and should
-stay there!
+We deleted some fancy @code{declare} forms for functions, such as
+@code{ftype}. Emacs Lisp is not a string-typed language, which makes
+these declarations anathema. The types @code{closure} and
+@code{interpreted-function} are gone for the same reason: no need to
+distinguish types of Lisp functions.
@item
-Various new Xwidget functions, such as
-@code{xwidget-perform-lispy-event}, @code{xwidget-webkit-load-html},
-and @code{xwidget-webkit-back-forward-list}, were deleted as part of
-our continuing effort to gradually delete the entire Xwidget
-functionality in some previous release of Emacs.
+The byte compiler stopped issuing warnings about practices some purists
+consider questionable. This includes warnings about missing
+@code{lexical-binding} cookies, empty bodies of special forms and
+macros, comparison with literals, @code{condition-case} without
+handlers, mutation of constants, and some others. As time moves into
+the past, the typical Emacs hacker knows best what's correct code and
+what isn't, and thus these warnings become useless annoyances. Good
+riddance!
@item
-Setting the @code{:stderr} property of a process in a
-@code{make-process} call once again forces the process's connection to
-use pipes, not ptys, for all the standard streams --- a considerable
-simplification of this complex interface.
-
-@item
-To keep the amount of Lisp functions from growing out of control, we
-deleted @code{string-equal-ignore-case}. Use @code{compare-strings}
-instead.
-
-Several features that complicated the byte compiler have been removed:
-
-@itemize @minus
-@item
-The warnings about quoting mistakes in documentation strings. You are
-expected to find such mistakes yourself, by eyeballing the resulting
-@file{*Help*} buffer display.
-
-@item
-The warnings about malformed @code{defcustom} types, like
-double-quoting symbols in @code{choice} lists.
-@end itemize
-
-@item
-The macro @code{with-buffer-unmodified-if-unchanged} was deleted.
-Lisp programs that need to leave the buffer unmodified in these cases
-can always compare the text before and after the modifications.
-
-@item
-The functions @code{string-edit} and @code{read-string-from-buffer}
-were removed, as we consider the fun of programming them anew every
-time an important part of the education of each Emacs Lisp developer.
-
-@item
-We deleted the function @code{readablep} and the related variable
-@code{print-unreadable-function}, since no one is supposed to want to
-print unreadable Lisp objects.
-
-@item
-The facility for storing multisession variables was deleted as an
-unnecessary complication. With it are gone @code{multisession-value},
-@code{define-multisession-variable}, and
-@code{list-multisession-values}.
-
-@item
-The support for the @code{cursor-face} text property was dropped. We
-consider the rest of the faces adequate for supporting this
-functionality.
-
-@item
-The function @code{tooltip-show} dropped support for optional face
-arguments @code{text-face} and @code{default-face} that allow fancy
-control of the face of the tip text and top frame colors. We decided
-that tooltips should all look the same, to prevent user confusion.
+The @code{obarray} type is gone. Obarrays are back to their original
+representation as vectors. Each removed Lisp data type makes Emacs
+simpler and easier to use, so this is a welcome deletion.
@item
As part of the ongoing quest for simplicity, many other functions and
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index a9da6c75367..6ddb70a3b9f 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2128,7 +2128,7 @@ motion and mouse motion.
However, some commands bound to
@code{down-mouse-1}--@code{mouse-drag-region}, for example--either
conflict with defined touch screen gestures (such as ``long-press to
-drag''), or with user expectations for touch input, and shouldn't
+drag''), or with user expectations for touch input, and should not
subject the touch sequence to simple translation. If a command whose
name contains the property (@pxref{Symbol Properties})
@code{ignored-mouse-command} is encountered or there is no command
@@ -2146,13 +2146,20 @@ compromise for packages which assume @code{mouse-drag-region} has
already set point to the location of any mouse click and selected the
window where it took place.
-To prevent unwanted @code{mouse-1} events arriving after a mouse menu
-is dismissed (@pxref{Mouse Menus}), Emacs also avoids simple
+To prevent unwanted @code{mouse-1} events from arriving after a mouse
+menu is dismissed (@pxref{Mouse Menus}), Emacs also disables simple
translation if @code{down-mouse-1} is bound to a keymap, making it a
prefix key. In lieu of simple translation, it translates the closing
-@code{touchscreen-end} to a @code{down-mouse-1} event with the
-starting position of the touch sequence, consequently displaying
-the mouse menu.
+@code{touchscreen-end} to a @code{down-mouse-1} event with the starting
+position of the touch sequence, consequently displaying the mouse menu.
+
+@vindex @code{touch-screen-simple-mouse-conversion}
+Simple conversion will be enabled without regard to the existence of
+command or menu bindings if the variable
+@code{touch-screen-simple-mouse-conversion} is bound or set to a
+non-@code{nil} value, as, for example, it may be by a caller of
+@code{read-key} expecting to receive @code{mouse-movement} and
+@code{drag-mouse-1} events.
@cindex @code{mouse-1-menu-command}, a symbol property
Since certain commands are also bound to @code{down-mouse-1} for the
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index 9f93fb4a981..65442dd8d19 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -1024,6 +1024,9 @@ Like 1, and in addition dump pseudo-C code.
Like 2, and in addition dump the GCC intermediate passes and
@file{libgccjit} log file.
@end table
+
+When generated, the pseudo-C code is deposited in the same directory
+as the corresponding @file{.eln} file.
@end defopt
@defopt native-comp-verbose
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 34096196df4..6e4b727a2bd 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1659,15 +1659,47 @@ overlay.
@end defun
@defun remove-overlays &optional start end name value
-This function removes all the overlays between @var{start} and
-@var{end} whose property @var{name} has the specified @var{value}. It
-can move the endpoints of the overlays in the region, or split them.
+This function clears the text in the region between @var{start} and
+@var{end} of any overlays whose property named @var{name} has the
+specified @var{value}, such that no such overlay will affect the text in
+the region. To do this, the function can remove overlays in the region,
+or move their endpoints, or split them, or do some combination of these.
+Specifically:
-If @var{name} is omitted or @code{nil}, it means to delete all overlays in
-the specified region. If @var{start} and/or @var{end} are omitted or
-@code{nil}, that means the beginning and end of the buffer respectively.
-Therefore, @code{(remove-overlays)} removes all the overlays in the
-current buffer.
+@itemize @bullet
+@item
+Overlays that start at or after @var{start} and end before @var{end}
+will be removed completely.
+
+@item
+Overlays that start before @var{start} and end after @var{start}, but
+before @var{end}, will be altered so that they end at @var{start}.
+
+@item
+Overlays that start at or after @var{start} and end after @var{end} will
+be altered so that they start at @var{end}.
+
+@item
+Overlays that start before @var{start} and end after @var{end} will be
+split into two overlays: one that ends at @var{start} and the other that
+begins at @var{end}.
+@end itemize
+
+If @var{name} is omitted or @code{nil}, it means to delete/modify all
+overlays that affect text in the specified region. If @var{start}
+and/or @var{end} are omitted or @code{nil}, they default to the
+beginning and end of the buffer, respectively. Therefore,
+@code{(remove-overlays)} removes all the overlays in the current buffer.
+
+Values of the named overlay property are compared using @code{eq}, which
+is important if the values are anything but symbols or fixnums
+(@pxref{Equality Predicates}). It means the values passed to the
+function must be the same values used to set the overlay property, not
+their copies; objects which are different will not compare equal even if
+they have identical contents.
+
+The optional arguments @var{name} and @var{value} should either both be
+passed and non-@code{nil}, or both omitted or @code{nil}.
@end defun
@defun copy-overlay overlay
@@ -5182,8 +5214,10 @@ specifications.
This convenience function can be used to get a specific display
property, no matter whether the @code{display} property is a vector, a
list or a simple property. This is like @code{get-text-property}
-(@pxref{Examining Properties}), but works on the @code{display}
-property only.
+(@pxref{Examining Properties}), but works on the @code{display} property
+only. For properties with a single value (e.g.@: @code{height}, this
+returns the value itself; for properties with a list of values (e.g.@:
+@code{slice}), this returns the list of values.
@var{position} is the position in the buffer or string to examine, and
@var{prop} is the @code{display} property to return. The optional
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 1059d0dcf61..f464bcfe94f 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -236,7 +236,7 @@ To view this manual in other formats, click
Appendices
-* Antinews:: Info for users downgrading to Emacs 28.
+* Antinews:: Info for users downgrading to Emacs 29.
* GNU Free Documentation License:: The license for this documentation.
* GPL:: Conditions for copying and changing GNU Emacs.
* Tips:: Advice and coding conventions for Emacs Lisp.
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index dcce4043064..695e1c3efb5 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -186,8 +186,8 @@ their code.
@end defun
@noindent
-Unlike @code{functionp}, the next three functions do @emph{not} treat
-a symbol as its function definition.
+Unlike @code{functionp}, the next functions do @emph{not} treat a symbol
+as its function definition.
@defun subrp object
This function returns @code{t} if @var{object} is a built-in function
@@ -243,6 +243,20 @@ without symbol indirection. It signals an error for non-built-in
functions. We recommend to use @code{func-arity} instead.
@end defun
+@defun cl-functionp object
+This function is like @code{functionp}, except it returns @code{nil} for
+lists and symbols.
+@end defun
+
+@findex subr-primitive-p
+@defun primitive-function-p object
+This function returns @code{t} if @var{object} is a built-in primitive
+written in C (@pxref{Primitive Function Type}). Note that special forms
+are explicitly excluded, as they are not functions. Use
+@code{subr-primitive-p} if you need to recognize special forms as well.
+@end defun
+
+
@node Lambda Expressions
@section Lambda Expressions
@cindex lambda expression
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 421e64dd5d1..40c550b56b4 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -192,10 +192,11 @@ used as the long description. (When displaying the description, Emacs
omits the @samp{;;; Commentary:} line, as well as the leading comment
characters in the commentary itself.)
- If the file has a @samp{Package-Requires} header, that is used as
-the package dependencies. In the above example, the package depends
-on the @samp{flange} package, version 1.0 or higher. @xref{Library
-Headers}, for a description of the @samp{Package-Requires} header. If
+ If the file has a @samp{Package-Requires} header, that is used as the
+package dependencies. In the above example, the package depends on the
+@samp{flange} package, version 1.0 or higher. @xref{Library Headers},
+for a description of the @samp{Package-Requires} header. To depend on a
+specific version of Emacs, specify @samp{emacs} as the package name. If
the header is omitted, the package has no dependencies.
The @samp{Keywords} and @samp{URL} headers are optional, but recommended.
@@ -247,9 +248,10 @@ is the brief description.
@var{requirements} is a list of required packages and their versions.
Each element in this list should have the form @code{(@var{dep-name}
-@var{dep-version})}, where @var{dep-name} is a symbol whose name is
-the dependency's package name, and @var{dep-version} is the
-dependency's version (a string).
+@var{dep-version})}, where @var{dep-name} is a symbol whose name is the
+dependency's package name, and @var{dep-version} is the dependency's
+version (a string). The spacial value @samp{emacs} means that the
+package depends on the given version of Emacs.
@end defun
If the content directory contains a file named @file{README}, this
diff --git a/doc/lispref/peg.texi b/doc/lispref/peg.texi
index e496e1cf817..01666456c9c 100644
--- a/doc/lispref/peg.texi
+++ b/doc/lispref/peg.texi
@@ -29,7 +29,7 @@ current buffer, using a given set of rules.
@cindex root, of parsing expression grammar
@cindex entry-point, of parsing expression grammar
Each rule in a @acronym{PEG} is referred to as a @dfn{parsing
-expression} (@acronym{PEX}), and can be specified a a literal string, a
+expression} (@acronym{PEX}), and can be specified a literal string, a
regexp-like character range or set, a peg-specific construct resembling
an Emacs Lisp function call, a reference to another rule, or a
combination of any of these. A grammar is expressed as a tree of rules
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 9193c1063d1..ead7833af61 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -875,14 +875,21 @@ nested defuns.
@findex treesit-forward-sentence
@findex forward-sentence
@findex backward-sentence
-If Emacs is compiled with tree-sitter, it can use the tree-sitter
-parser information to move across syntax constructs. Since what
-exactly is considered a sentence varies between languages, a major
-mode should set @code{treesit-thing-settings} to determine that.
-Then the mode can get navigation-by-sentence functionality for free,
-by using @code{forward-sentence} and
-@code{backward-sentence}(@pxref{Moving by Sentences,,, emacs, The
-extensible self-documenting text editor}).
+@vindex forward-sentence-function
+@cindex sentence, in program source files
+The function that is the value of the variable
+@code{forward-sentence-function} determines how to move across syntax
+constructs known as @dfn{sentences}. Major modes can assign their own
+functions to this variable to customize the behavior of
+@code{forward-sentence} command. If Emacs is compiled with tree-sitter,
+it can use the tree-sitter parser information to move across syntax
+constructs. Since what exactly is considered a sentence varies between
+languages, a major mode should set @code{treesit-thing-settings} to
+determine that. Then @code{forward-sentence-function} will be set to
+@code{treesit-forward-sentence}, and the mode will get
+navigation-by-sentence functionality for free, by using
+@code{forward-sentence} and @code{backward-sentence}(@pxref{Moving by
+Sentences,,, emacs, The extensible self-documenting text editor}).
@findex treesit-forward-sexp
@findex forward-sexp@r{, and tree-sitter}
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 6e5c3521135..e290e2e7a6b 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -406,11 +406,12 @@ that matches @var{trim-right} from @var{string}. Both regexps
default to @samp{[ \t\n\r]+}.
@end defun
-@defun string-fill string length
-Attempt to Word-wrap @var{string} so that no lines are longer than
-@var{length}. Filling is done on whitespace boundaries only. If
-there are individual words that are longer than @var{length}, these
-will not be shortened.
+@defun string-fill string width
+Attempt to Word-wrap @var{string} so that it displays with lines no
+wider than @var{width}. Filling is done on whitespace boundaries only.
+If there are individual words that are longer than @var{width}, these
+will not be shortened, and therefore @var{string} might be shown with
+lines wider than @var{width} in that case.
@end defun
@defun string-limit string length &optional end coding-system
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 1e35b82e413..802fa0febed 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -611,7 +611,7 @@ little space in a running Emacs.
@item
Format the documentation string so that it fits in an Emacs window on an
80-column screen. It is a good idea for most lines to be no wider than
-60 characters. The first line should not be wider than 67 characters
+60 characters. The first line should not be wider than 74 characters,
or it will look bad in the output of @code{apropos}.
@vindex emacs-lisp-docstring-fill-column
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 381da21cebe..54909c130c3 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28482,7 +28482,7 @@ logarithmic scales, Calc uses the @kbd{l} prefix for functions
operating on notes.
Scientific pitch notation refers to a note by giving a letter
-A through G, possibly followed by a flat or sharp) with a subscript
+A through G, possibly followed by a flat or sharp, with a subscript
indicating an octave number. Each octave starts with C and ends with
B and
@c increasing each note by a semitone will result
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 7f299180fc6..bcbd9faf0c9 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -835,12 +835,14 @@ Emacs Manual}, for fuller details. @code{comment-region} isn't
actually part of @ccmode{}; it is given a @ccmode{} binding for
convenience.
-@item @kbd{M-;} (@code{comment-dwim} or @code{indent-for-comment} @footnote{The name of this command varies between (X)Emacs versions.})
+@item @kbd{M-;} (@code{comment-dwim} or @code{indent-for-comment})
@kindex M-;
@findex comment-dwim
@findex indent-for-comment
Insert a comment at the end of the current line, if none is there
-already. Then reindent the comment according to @code{comment-column}
+already@footnote{The name of this command varies between (X)Emacs
+versions.}. Then reindent the comment according to
+@code{comment-column}
@ifclear XEMACS
(@pxref{Options for Comments,,, emacs, GNU Emacs Manual})
@end ifclear
@@ -1221,15 +1223,17 @@ also suppresses auto-newline mode.
Toggle auto-newline minor mode. When the command turns the mode on,
it also enables electric minor mode.
-@item @kbd{M-x c-toggle-hungry-state}@footnote{Prior to @ccmode{} 5.31, this command was bound to @kbd{C-c C-d}.}
+@item @kbd{M-x c-toggle-hungry-state}
@findex c-toggle-hungry-state
@findex toggle-hungry-state @r{(c-)}
-Toggle hungry-delete minor mode.
+Toggle hungry-delete minor mode@footnote{Prior to @ccmode{} 5.31, this
+command was bound to @kbd{C-c C-d}.}.
-@item @kbd{M-x c-toggle-auto-hungry-state}@footnote{Prior to @ccmode{} 5.31, this command was bound to @kbd{C-c C-t}.}
+@item @kbd{M-x c-toggle-auto-hungry-state}
@findex c-toggle-auto-hungry-state
@findex toggle-auto-hungry-state @r{(c-)}
-Toggle both auto-newline and hungry delete minor modes.
+Toggle both auto-newline and hungry delete minor modes@footnote{Prior to
+@ccmode{} 5.31, this command was bound to @kbd{C-c C-t}.}.
@item @kbd{C-c C-w} (@code{M-x subword-mode})
@kindex C-c C-w
@@ -1569,7 +1573,7 @@ perform @code{c-hungry-delete-backwards} and
rather than using the minor mode toggling.
@table @asis
-@item @kbd{C-c C-@key{DEL}}, or @kbd{C-c @key{DEL}} (@code{c-hungry-delete-backwards})@footnote{This command was formerly known as @code{c-hungry-backspace}.}
+@item @kbd{C-c C-@key{DEL}}, or @kbd{C-c @key{DEL}} (@code{c-hungry-delete-backwards})
@kindex C-c C-Backspace
@kindex C-c Backspace
@kindex C-c C-DEL
@@ -1580,7 +1584,8 @@ Delete any amount of whitespace in the backwards direction (regardless
whether hungry-delete mode is enabled or not). This command is bound
to both @kbd{C-c C-@key{DEL}} and @kbd{C-c @key{DEL}}, since the more
natural one, @kbd{C-c C-@key{DEL}}, is sometimes difficult to type at
-a character terminal.
+a character terminal@footnote{This command was formerly known as
+@code{c-hungry-backspace}.}.
@item @kbd{C-c C-d}, @kbd{C-c C-@key{DELETE}}, or @kbd{C-c @key{DELETE}} (@code{c-hungry-delete-forward})
@kindex C-c C-d
@@ -5128,7 +5133,7 @@ started on line 2. Lines 4 and 5 get the syntaxes
though part of a function.
Note that the @code{requires} on Line 3 begins a @dfn{requires
-expression}, not a a requires clause, hence its components are not
+expression}, not a requires clause, hence its components are not
assigned @code{constraint-cont}. See
@url{https://en.cppreference.com/w/cpp/language/requires}.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index e5d867acd40..20d26c80d38 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1208,7 +1208,7 @@ which carries the input parameters to the object owning the method to
be called, and a reply message returning the resulting output
parameters from the object.
-@defun dbus-call-method bus service path interface method &optional :timeout timeout &rest args
+@defun dbus-call-method bus service path interface method &optional :timeout timeout :authorizable auth &rest args
@anchor{dbus-call-method}
This function calls @var{method} on the D-Bus @var{bus}. @var{bus} is
either the keyword @code{:system} or the keyword @code{:session}.
@@ -1223,6 +1223,10 @@ method call must return. The default value is 25,000. If the method
call doesn't return in time, a D-Bus error is raised (@pxref{Errors
and Events}).
+If the parameter @code{:authorizable} is given and the following
+@var{auth} is non-@code{nil}, the invoked method may interactively
+prompt the user for authorization. The default is @code{nil}.
+
The remaining arguments @var{args} are passed to @var{method} as
arguments. They are converted into D-Bus types as described in
@ref{Type Conversion}.
@@ -1302,7 +1306,7 @@ emulate the @code{lshal} command on GNU/Linux systems:
@cindex method calls, asynchronous
@cindex asynchronous method calls
-@defun dbus-call-method-asynchronously bus service path interface method handler &optional :timeout timeout &rest args
+@defun dbus-call-method-asynchronously bus service path interface method handler &optional :timeout timeout :authorizable auth &rest args
This function calls @var{method} on the D-Bus @var{bus}
asynchronously. @var{bus} is either the keyword @code{:system} or the
keyword @code{:session}.
@@ -1321,6 +1325,10 @@ reply message must arrive. The default value is 25,000. If there is
no reply message in time, a D-Bus error is raised (@pxref{Errors and
Events}).
+If the parameter @code{:authorizable} is given and the following
+@var{auth} is non-@code{nil}, the invoked method may interactively
+prompt the user for authorization. The default is @code{nil}.
+
The remaining arguments @var{args} are passed to @var{method} as
arguments. They are converted into D-Bus types as described in
@ref{Type Conversion}.
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 5b722f9fd77..73bc2442678 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -847,6 +847,7 @@ in the Emacs development repository (@pxref{Latest version of Emacs}).
@menu
* Origin of the term Emacs::
* Latest version of Emacs::
+* New in Emacs 30::
* New in Emacs 29::
* New in Emacs 28::
* New in Emacs 27::
@@ -920,6 +921,90 @@ Emacs, type @kbd{C-h C-n} (@kbd{M-x view-emacs-news}). You can give
this command a prefix argument to read about which features were new
in older versions.
+
+@node New in Emacs 30
+@section What is different about Emacs 30?
+@cindex Differences between Emacs 29 and Emacs 30
+@cindex Emacs 30, new features in
+
+Here's a list of the most important changes in Emacs 30 as compared to
+Emacs 29. The full list is too long to fit here, but can be read in the
+Emacs @file{NEWS} file by typing @kbd{C-h n} inside Emacs.
+
+@itemize
+@item
+Native compilation is now enabled by default. When Emacs is built on a
+machine with @samp{libgccjit}, this will improve Emacs performance in
+many typical workloads.
+
+@item
+Emacs has been ported to the Android operating system. See the file
+@file{java/INSTALL} in the Emacs source distribution for details on how
+to build it.
+
+@item
+Numerous performance improvements, for example in parsing JSON, reading
+data from subprocesses, handling output from Eshell and in Shell mode, X
+selection requests, remote files, and so on.
+
+@item
+Native JSON support is now always available; libjansson is no longer
+used.
+
+@item
+New major modes based on the
+@uref{https://tree-sitter.github.io/tree-sitter/, tree-sitter library}
+library for editing Elixir, HTML, Lua, HEEx, and PHP.
+
+@item
+Support for the EditorConfig standard has been added, an editor-neutral
+way to provide directory local (project-wide) settings. It is enabled
+via a new global minor mode @code{editorconfig-mode} which makes Emacs
+obey the @file{.editorconfig} files.
+
+@item
+Support for touchscreens has been improved. On systems that understand
+them (at present X, Android, PGTK, and MS-Windows), many touch screen
+gestures are now implemented and translated into mouse or gesture
+events, and support for tapping tool bar buttons and opening menus has
+been added.
+
+@item
+Tool bar tweaks. The new minor mode @code{window-tool-bar-mode}
+provides a per-window toolbar. Toolbars can be placed on the bottom of
+a frame by setting the @code{tool-bar-position} variable on all window
+systems but GNUStep and macOS.
+
+@item
+The @samp{which-key} package from GNU ELPA is now included in Emacs.
+After enabling the minor mode mode @code{which-key-mode}, if you enter
+@kbd{C-x} and wait for one second, the minibuffer will expand with all
+available key bindings that follow @kbd{C-x} (or as many as space
+allows).
+
+@item
+New global minor mode @code{kill-ring-deindent-mode}. When enabled,
+text being saved to the kill ring will be de-indented by the column
+number at its start.
+
+@item
+New minor mode @code{visual-wrap-prefix-mode}. Unlike @kbd{M-q}, the
+indentation only happens on display, and doesn't change the buffer text
+in any way.
+
+@item
+Automatic regeneration of TAGS files using the new global minor mode
+@code{etags-regen-mode}.
+
+@item
+Improved warnings from the byte-code compiler to aid Lisp developers.
+
+@item
+Support for underline colors on TTY frames.
+
+@end itemize
+
+
@node New in Emacs 29
@section What is different about Emacs 29?
@cindex Differences between Emacs 28 and Emacs 29
@@ -929,6 +1014,9 @@ Here's a list of the most important changes in Emacs 29 as compared to
Emacs 28 (the full list is too long, and can be read in the Emacs
@file{NEWS} file by typing @kbd{C-h n} inside Emacs).
+Note that Emacs 29.3 and 29.4 both contained important security fixes.
+Upgrading is particularly important if you use Emacs as a mail client.
+
@itemize
@item
Emacs can now be built with the
@@ -1718,7 +1806,7 @@ is better to write ``Emacs and XEmacs.''
* Deleting menus and menu options::
* Turning on syntax highlighting::
* Scrolling only one line::
-* Editing MS-DOS files::
+* Editing Windows files::
* Filling paragraphs with a single space::
* Escape sequences in shell output::
* Start Emacs maximized::
@@ -1786,7 +1874,7 @@ customize, with completion.
Colors and faces are supported in non-windowed mode, i.e., on Unix and
GNU/Linux text-only terminals and consoles, and when invoked as
-@samp{emacs -nw} on X, MS-DOS and MS-Windows. Emacs automatically
+@samp{emacs -nw} on X, MS-Windows and MS-DOS. Emacs automatically
detects color support at startup and uses it if available. If you
think that your terminal supports colors, but Emacs won't use them,
check the @code{termcap} entry for your display type for color-related
@@ -3073,22 +3161,22 @@ Alternatively, use the following Lisp form in your init file
(setq scroll-conservatively most-positive-fixnum)
@end lisp
-@node Editing MS-DOS files
-@section How can I edit MS-DOS files using Emacs?
-@cindex Editing MS-DOS files
-@cindex MS-DOS files, editing
+@node Editing Windows files
+@section How can I edit Windows files using Emacs?
@cindex Microsoft files, editing
@cindex Windows files, editing
+@cindex Editing MS-DOS files
+@cindex MS-DOS files, editing
-Detection and handling of MS-DOS (and Windows) files is performed
-transparently. You can open MS-DOS files on a Unix system, edit it,
+Detection and handling of Windows (and MS-DOS) files is performed
+transparently. You can open Windows files on a Unix system, edit it,
and save it without having to worry about the file format.
-When editing an MS-DOS style file, the mode line will indicate that it
-is a DOS file. On Unix and GNU/Linux systems, and also on a Macintosh,
-the string @samp{(DOS)} will appear near the left edge of the mode line;
-on DOS and Windows, where the DOS end-of-line (EOL) format is the
-default, a backslash (@samp{\}) will appear in the mode line.
+When editing a Windows style file, the mode line will indicate that it
+is a Windows file. On GNU/Linux, Unix and macOS systems, the string
+@samp{(DOS)} will appear near the left edge of the mode line; on Windows
+and MS-DOS, where the DOS end-of-line (EOL) format is the default, a
+backslash (@samp{\}) will appear in the mode line.
@node Filling paragraphs with a single space
@section How can I tell Emacs to fill paragraphs with a single space after each period?
@@ -3576,6 +3664,21 @@ same privileges as the Emacs process itself. Be aware of this when
you use the package system (e.g. @code{M-x list-packages}) with third
party archives. Use only third parties that you can trust!
+@item
+Using an out-of-date Emacs version.
+
+For security purposes, we recommend always using the latest officially
+released version of Emacs. Using old versions of Emacs might put your
+security at risk, as newer versions occasionally include important
+security fixes. Please review the Emacs release notes and the
+@file{etc/NEWS} file for details.
+
+Upgrading to the most recent version is particularly important if you
+use Emacs as a mail client, or to edit files that come from untrusted
+sources. You should be able to install the latest version of Emacs
+through your system's package manager, and it is always available at
+@uref{https://www.gnu.org/software/emacs/, the Emacs website}.
+
@item
The @code{file-local-variable} feature. (Yes, a risk, but easy to
change.)
@@ -4436,7 +4539,7 @@ display or is invoked with @samp{emacs -nw}, you typically need to use
@code{set-terminal-coding-system} to tell Emacs what the terminal can
display, even after setting the language environment; otherwise
non-@acronym{ASCII} characters will display as @samp{?}. On other operating
-systems, such as MS-DOS and MS-Windows, Emacs queries the OS about the
+systems, such as MS-Windows and MS-DOS, Emacs queries the OS about the
character set supported by the display, and sets up the required
terminal coding system automatically.
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index c7cbf7908b8..75138a9963f 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/erc.info
@settitle ERC Manual
-@set ERCVER 5.6
+@set ERCVER 5.6.1
@set ERCDIST as distributed with Emacs @value{EMACSVER}
@include docstyle.texi
@syncodeindex fn cp
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 69f94fab469..8547131194e 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1201,8 +1201,11 @@ or a string, referring to an environment variable.
@cmindex wait
@cindex processes, waiting for
-@item wait [@var{process}]@dots{}
-Wait until each specified @var{process} has exited.
+@item wait [-t @var{timeout}] [@var{process}]@dots{}
+Wait until each specified @var{process} has exited. Processes can
+either be process objects (@pxref{Processes, , , elisp, GNU Emacs Lisp
+Reference Manual}) or integer PIDs. If you pass @code{-t} or
+@code{--timeout}, wait at most that many seconds before exiting.
@cmindex which
@item which @var{command}@dots{}
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index eec6b3c3299..e0c6b7d610b 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -373,6 +373,15 @@ customizing @code{shr-blocked-images}.
@code{shr-inhibit-images}. If this variable is @code{nil}, display
the ``ALT'' text of images instead.
+@vindex shr-sliced-image-height
+ To make scrolling up/down past images more intuititve, EWW splits
+large images into several rows. This way, you can scroll individually
+past each slice, instead of jumping past the entire image. EWW slices
+images that take up more than @code{shr-sliced-image-height} of the
+height of the window they are displayed in. For example, a value of 0.7
+means that images are allowed to take up 70% of the height of the window
+before being sliced.
+
@vindex shr-color-visible-distance-min
@vindex shr-color-visible-luminance-min
@cindex Contrast
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 56f259db9a1..b2dfc46f74c 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -20413,7 +20413,7 @@ Anyway, if you'd like to dig into it yourself, here's an example:
(read-only nil)
(orphan -10)
(adapt t)
- (files "/hom/larsi/News/gnu.SCORE")
+ (files "/home/larsi/News/gnu.SCORE")
(exclude-files "all.SCORE")
(local (gnus-newsgroup-auto-expire t)
(gnus-summary-make-false-root empty))
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 31431a6ffc9..fc2935ebe6d 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -23163,7 +23163,7 @@ specify a date December 1, 2005, the call might look like
=(diary-date 12 1 2005)= or =(diary-date 1 12 2005)= or =(diary-date
2005 12 1)=, depending on the settings. This has been the source of
much confusion. Org mode users can resort to special versions of
-these functions, namely ~org-date~, ~org-anniversary~, ~org-cyclic, and
+these functions, namely ~org-date~, ~org-anniversary~, ~org-cyclic~, and
~org-block~. These work just like the corresponding ~diary-~
functions, but with stable ISO order of arguments (year, month, day)
wherever applicable, independent of the value of
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index bf5c90ee8a9..b17dde18656 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -7,7 +7,7 @@
@c In the Tramp GIT, the version number and the bug report address
@c are auto-frobbed from configure.ac.
-@set trampver 2.7.1-pre
+@set trampver 2.7.2-pre
@set trampurl https://www.gnu.org/software/tramp/
@set tramp-bug-report-address tramp-devel@@gnu.org
@set emacsver 27.1
diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index 7e8ffcf91bf..22db4e82143 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Transient User and Developer Manual
-@subtitle for version 0.7.0
+@subtitle for version 0.7.2
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ resource to get over that hurdle is Psionic K's interactive tutorial,
available at @uref{https://github.com/positron-solutions/transient-showcase}.
@noindent
-This manual is for Transient version 0.7.0.
+This manual is for Transient version 0.7.2.
@insertcopying
@end ifnottex
@@ -1208,7 +1208,10 @@ prefix's @code{transient--layout} property, but it is often more convenient
to use the same form as understood by @code{transient-define-prefix},
described below. If you use the latter approach, you can use the
@code{transient-parse-suffixes} and @code{transient-parse-suffix} functions to
-transform them from the convenient to the expected form.
+transform them from the convenient to the expected form. Depending
+on the used group class, @code{transient-parse-suffixes}'s SUFFIXES must be
+a list of group vectors (for @code{transient-columns}) or a list of suffix
+lists (for all other group classes).
If you explicitly specify children and then transform them using
@code{:setup-children}, then the class of the group is determined as usual,
@@ -1220,6 +1223,32 @@ For backward compatibility, if you fail to do so, @code{transient-column}
is used and a warning is displayed. This warning will eventually
be replaced with an error.
+@lisp
+(transient-define-prefix my-finder-by-keyword ()
+ "Select a keyword and list matching packages."
+ ;; The real `finder-by-keyword' is more convenient
+ ;; of course, but that is not the point here.
+ [:class transient-columns
+ :setup-children
+ (lambda (_)
+ (transient-parse-suffixes
+ 'my-finder-by-keyword
+ (let ((char (1- ?A)))
+ (mapcar ; a list ...
+ (lambda (partition)
+ (vconcat ; of group vectors ...
+ (mapcar (lambda (elt)
+ (let ((keyword (symbol-name (car elt))))
+ ; ... where each suffix is a list
+ (list (format "%c" (cl-incf char))
+ keyword
+ (lambda ()
+ (interactive)
+ (finder-list-matches keyword)))))
+ partition)))
+ (seq-partition finder-known-keywords 7)))))])
+@end lisp
+
@item
The boolean @code{:pad-keys} argument controls whether keys of all suffixes
contained in a group are right padded, effectively aligning the
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 2e378e86fc7..744b84ac80d 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -3287,6 +3287,16 @@ Face used for pressed buttons.
Face used for inactive widgets.
@end deffn
+@deffn Face widget-unselected
+Face used for unselected widgets. This face is also used on the text
+labels of radio-button and checkbox widgets.
+
+The default value inherits from the @code{widget-inactive} face. If you
+want to visually distinguish the labels of unselected active
+radio-button or checkbox widgets from the labels of unselected inactive
+widgets, customize this face to a non-default value.
+@end deffn
+
@defopt widget-mouse-face
Face used for highlighting a button when the mouse pointer moves
across it.
diff --git a/etc/DEBUG b/etc/DEBUG
index 4eae090621f..06544674e5d 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1157,6 +1157,12 @@ Please refer to the LLDB reference on the web for more information
about LLDB. If you already know GDB, you will also find a mapping
from GDB commands to corresponding LLDB commands there.
+** Debugging Emacs on OpenBSD
+
+To debug Emacs on OpenBSD, use the 'egdb' command from the 'gdb'
+package. This reportedly works both if Emacs was compiled with GCC and
+if it was compiled with clang.
+
** Debugging Emacs on Android.
A script located in the java/ directory automates the procedures
@@ -1282,39 +1288,39 @@ the crash.
The third form is printed when Emacs misuses the JVM in some fashion
that is detected by the Android CheckJNI facility. It looks like:
-A/art﹕ art/runtime/check_jni.cc:65] JNI DETECTED ERROR IN APPLICATION: ...
-A/art﹕ art/runtime/check_jni.cc:65] in call to CallVoidMethodV
-A/art﹕ art/runtime/check_jni.cc:65] from void android.os.MessageQueue.nativePollOnce(long, int)
-A/art﹕ art/runtime/check_jni.cc:65] "main" prio=5 tid=1 Runnable
-A/art﹕ art/runtime/check_jni.cc:65] | group="main" sCount=0 dsCount=0 obj=0x87d30ef0 self=0xb4f07800
-A/art﹕ art/runtime/check_jni.cc:65] | sysTid=18828 nice=-11 cgrp=apps sched=0/0 handle=0xb6fdeec8
-A/art﹕ art/runtime/check_jni.cc:65] | state=R schedstat=( 2249126546 506089308 3210 ) utm=183 stm=41 core=3 HZ=100
-A/art﹕ art/runtime/check_jni.cc:65] | stack=0xbe0c8000-0xbe0ca000 stackSize=8MB
-A/art﹕ art/runtime/check_jni.cc:65] | held mutexes= "mutator lock"(shared held)
-A/art﹕ art/runtime/check_jni.cc:65] native: #00 pc 00004640 /system/lib/libbacktrace_libc++.so (UnwindCurrent::Unwind(unsigned int, ucontext*)+23)
-A/art﹕ art/runtime/check_jni.cc:65] native: #01 pc 00002e8d /system/lib/libbacktrace_libc++.so (Backtrace::Unwind(unsigned int, ucontext*)+8)
-A/art﹕ art/runtime/check_jni.cc:65] native: #02 pc 00248381 /system/lib/libart.so (art::DumpNativeStack(std::__1::basic_ostream >&, int, char const*, art::mirror::ArtMethod*)+68)
-A/art﹕ art/runtime/check_jni.cc:65] native: #03 pc 0022cd0b /system/lib/libart.so (art::Thread::Dump(std::__1::basic_ostream >&) const+146)
-A/art﹕ art/runtime/check_jni.cc:65] native: #04 pc 000b189b /system/lib/libart.so (art::JniAbort(char const*, char const*)+582)
-A/art﹕ art/runtime/check_jni.cc:65] native: #05 pc 000b1fd5 /system/lib/libart.so (art::JniAbortF(char const*, char const*, ...)+60)
-A/art﹕ art/runtime/check_jni.cc:65] native: #06 pc 000b50e5 /system/lib/libart.so (art::ScopedCheck::ScopedCheck(_JNIEnv*, int, char const*)+1284)
-A/art﹕ art/runtime/check_jni.cc:65] native: #07 pc 000bc59f /system/lib/libart.so (art::CheckJNI::CallVoidMethodV(_JNIEnv*, _jobject*, _jmethodID*, std::__va_list)+30)
-A/art﹕ art/runtime/check_jni.cc:65] native: #08 pc 00063803 /system/lib/libandroid_runtime.so (???)
-A/art﹕ art/runtime/check_jni.cc:65] native: #09 pc 000776bd /system/lib/libandroid_runtime.so (android::NativeDisplayEventReceiver::dispatchVsync(long long, int, unsigned int)+40)
-A/art﹕ art/runtime/check_jni.cc:65] native: #10 pc 00077885 /system/lib/libandroid_runtime.so (android::NativeDisplayEventReceiver::handleEvent(int, int, void*)+80)
-A/art﹕ art/runtime/check_jni.cc:65] native: #11 pc 00010f6f /system/lib/libutils.so (android::Looper::pollInner(int)+482)
-A/art﹕ art/runtime/check_jni.cc:65] native: #12 pc 00011019 /system/lib/libutils.so (android::Looper::pollOnce(int, int*, int*, void**)+92)
-A/art﹕ art/runtime/check_jni.cc:65] native: #13 pc 000830c1 /system/lib/libandroid_runtime.so (android::NativeMessageQueue::pollOnce(_JNIEnv*, int)+22)
-A/art﹕ art/runtime/check_jni.cc:65] native: #14 pc 000b22d7 /system/framework/arm/boot.oat (Java_android_os_MessageQueue_nativePollOnce__JI+102)
-A/art﹕ art/runtime/check_jni.cc:65] at android.os.MessageQueue.nativePollOnce(Native method)
-A/art﹕ art/runtime/check_jni.cc:65] at android.os.MessageQueue.next(MessageQueue.java:143)
-A/art﹕ art/runtime/check_jni.cc:65] at android.os.Looper.loop(Looper.java:130)
-A/art﹕ art/runtime/check_jni.cc:65] at android.app.ActivityThread.main(ActivityThread.java:5832)
-A/art﹕ art/runtime/check_jni.cc:65] at java.lang.reflect.Method.invoke!(Native method)
-A/art﹕ art/runtime/check_jni.cc:65] at java.lang.reflect.Method.invoke(Method.java:372)
-A/art﹕ art/runtime/check_jni.cc:65] at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:1399)
-A/art﹕ art/runtime/check_jni.cc:65] at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1194)
-A/art﹕ art/runtime/check_jni.cc:65]
+A/art: art/runtime/check_jni.cc:65] JNI DETECTED ERROR IN APPLICATION: ...
+A/art: art/runtime/check_jni.cc:65] in call to CallVoidMethodV
+A/art: art/runtime/check_jni.cc:65] from void android.os.MessageQueue.nativePollOnce(long, int)
+A/art: art/runtime/check_jni.cc:65] "main" prio=5 tid=1 Runnable
+A/art: art/runtime/check_jni.cc:65] | group="main" sCount=0 dsCount=0 obj=0x87d30ef0 self=0xb4f07800
+A/art: art/runtime/check_jni.cc:65] | sysTid=18828 nice=-11 cgrp=apps sched=0/0 handle=0xb6fdeec8
+A/art: art/runtime/check_jni.cc:65] | state=R schedstat=( 2249126546 506089308 3210 ) utm=183 stm=41 core=3 HZ=100
+A/art: art/runtime/check_jni.cc:65] | stack=0xbe0c8000-0xbe0ca000 stackSize=8MB
+A/art: art/runtime/check_jni.cc:65] | held mutexes= "mutator lock"(shared held)
+A/art: art/runtime/check_jni.cc:65] native: #00 pc 00004640 /system/lib/libbacktrace_libc++.so (UnwindCurrent::Unwind(unsigned int, ucontext*)+23)
+A/art: art/runtime/check_jni.cc:65] native: #01 pc 00002e8d /system/lib/libbacktrace_libc++.so (Backtrace::Unwind(unsigned int, ucontext*)+8)
+A/art: art/runtime/check_jni.cc:65] native: #02 pc 00248381 /system/lib/libart.so (art::DumpNativeStack(std::__1::basic_ostream >&, int, char const*, art::mirror::ArtMethod*)+68)
+A/art: art/runtime/check_jni.cc:65] native: #03 pc 0022cd0b /system/lib/libart.so (art::Thread::Dump(std::__1::basic_ostream >&) const+146)
+A/art: art/runtime/check_jni.cc:65] native: #04 pc 000b189b /system/lib/libart.so (art::JniAbort(char const*, char const*)+582)
+A/art: art/runtime/check_jni.cc:65] native: #05 pc 000b1fd5 /system/lib/libart.so (art::JniAbortF(char const*, char const*, ...)+60)
+A/art: art/runtime/check_jni.cc:65] native: #06 pc 000b50e5 /system/lib/libart.so (art::ScopedCheck::ScopedCheck(_JNIEnv*, int, char const*)+1284)
+A/art: art/runtime/check_jni.cc:65] native: #07 pc 000bc59f /system/lib/libart.so (art::CheckJNI::CallVoidMethodV(_JNIEnv*, _jobject*, _jmethodID*, std::__va_list)+30)
+A/art: art/runtime/check_jni.cc:65] native: #08 pc 00063803 /system/lib/libandroid_runtime.so (???)
+A/art: art/runtime/check_jni.cc:65] native: #09 pc 000776bd /system/lib/libandroid_runtime.so (android::NativeDisplayEventReceiver::dispatchVsync(long long, int, unsigned int)+40)
+A/art: art/runtime/check_jni.cc:65] native: #10 pc 00077885 /system/lib/libandroid_runtime.so (android::NativeDisplayEventReceiver::handleEvent(int, int, void*)+80)
+A/art: art/runtime/check_jni.cc:65] native: #11 pc 00010f6f /system/lib/libutils.so (android::Looper::pollInner(int)+482)
+A/art: art/runtime/check_jni.cc:65] native: #12 pc 00011019 /system/lib/libutils.so (android::Looper::pollOnce(int, int*, int*, void**)+92)
+A/art: art/runtime/check_jni.cc:65] native: #13 pc 000830c1 /system/lib/libandroid_runtime.so (android::NativeMessageQueue::pollOnce(_JNIEnv*, int)+22)
+A/art: art/runtime/check_jni.cc:65] native: #14 pc 000b22d7 /system/framework/arm/boot.oat (Java_android_os_MessageQueue_nativePollOnce__JI+102)
+A/art: art/runtime/check_jni.cc:65] at android.os.MessageQueue.nativePollOnce(Native method)
+A/art: art/runtime/check_jni.cc:65] at android.os.MessageQueue.next(MessageQueue.java:143)
+A/art: art/runtime/check_jni.cc:65] at android.os.Looper.loop(Looper.java:130)
+A/art: art/runtime/check_jni.cc:65] at android.app.ActivityThread.main(ActivityThread.java:5832)
+A/art: art/runtime/check_jni.cc:65] at java.lang.reflect.Method.invoke!(Native method)
+A/art: art/runtime/check_jni.cc:65] at java.lang.reflect.Method.invoke(Method.java:372)
+A/art: art/runtime/check_jni.cc:65] at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:1399)
+A/art: art/runtime/check_jni.cc:65] at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1194)
+A/art: art/runtime/check_jni.cc:65]
In such situations, the first line explains what infraction Emacs
committed, while the ensuing ones print backtraces for each running
diff --git a/etc/NEWS b/etc/NEWS
index af32a93d9c4..f10f9ae4d65 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -36,6 +36,76 @@ applies, and please also update docstrings as needed.
* Changes in Specialized Modes and Packages in Emacs 31.1
+** Whitespace
+
+---
+*** 'whitespace-cleanup' now adds missing newline at end of file.
+If 'whitespace-style' includes 'missing-newline-at-eof (which is the
+default), the 'whitespace-cleanup' function will now add the newline.
+
+** Eshell
+
+---
+*** New option 'eshell-command-async-buffer'.
+This option lets you tell 'eshell-command' how to respond if its output
+buffer is already in use by another invocation of 'eshell-command', much
+like 'async-shell-command-buffer' does for 'shell-command'. By default,
+this will prompt for confirmation before creating a new buffer when
+necessary. To restore the previous behavior, set this option to
+'confirm-kill-process'.
+
++++
+*** Eshell's built-in "wait" command now accepts a timeout.
+By passing "-t" or "--timeout", you can specify a maximum time to wait
+for the processes to exit. Additionally, you can now wait for external
+processes by passing their PIDs.
+
+** SHR
+
++++
+*** SHR now slices large images into rows.
+Sliced images allow for more intuitive scrolling up/down by letting you
+scroll past each slice, instead of jumping past the entire image.
+Previously, SHR sliced images when zoomed to their original size, no
+matter how large or small that was). Now, SHR slices any images taller
+than 'shr-sliced-image-height'. For more information, see the "(eww)
+Advanced" node in the EWW manual.
+
+---
+*** You can now customize the image zoom levels to cycle through.
+By customizing 'shr-image-zoom-levels', you can change the list of zoom
+levels that SHR cycles through when calling 'shr-zoom-image'.
+
+** Emacs Lisp mode
+
+---
+*** Checkdoc no longer warns about missing footer lines in some cases.
+Emacs Lisp libraries have traditionally ended with a footer line
+(sometimes referred to as "terminating comment"). Their purpose was to
+easily detect files that had been truncated in transit on ancient and
+less reliable connections:
+
+ ;; some-cool-package.el ends here
+
+'checkdoc' will no longer warn if that line is missing for packages that
+explicitly only support Emacs 30.1 or later, as specified in the
+"Package-Requires" header. The reason for keeping the warning for
+packages that support earlier versions of Emacs is that package.el in
+those versions can't install packages where that line is missing.
+
+This change affects both 'M-x checkdoc' and the corresponding flymake
+backend.
+
+---
+*** Checkdoc will now flag incorrect formatting in warnings.
+This affects calls to 'warn', 'lwarn', 'display-warning', and
+'message-box'.
+
+---
+*** The default of 'checkdoc-verb-check-experimental-flag' is now nil.
+In most cases, having it enabled leads to a large amount of false
+positives.
+
* New Modes and Packages in Emacs 31.1
@@ -45,9 +115,21 @@ applies, and please also update docstrings as needed.
* Lisp Changes in Emacs 31.1
++++
+*** Support interactive D-Bus authorization.
+A new ':authorizable t' parameter has been added to 'dbus-call-method'
+and 'dbus-call-method-asynchronously' to allow the user to interactively
+authorize the invoked D-Bus method (e.g., via polkit).
+
* Changes in Emacs 31.1 on Non-Free Operating Systems
+---
+** Process execution has been optimized on Android.
+The run-time performance of subprocesses on recent Android releases
+where a userspace executable loader is required has been optimized on
+systems featuring Linux 3.5.0 and above.
+
----------------------------------------------------------------------
This file is part of GNU Emacs.
diff --git a/etc/NEWS.30 b/etc/NEWS.30
index d8fa92eb71e..31d69ddabab 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -24,13 +24,6 @@ applies, and please also update docstrings as needed.
* Installation Changes in Emacs 30.1
-+++
-** Emacs has been ported to the Android operating system.
-This requires Emacs to be compiled on another computer. The Android
-NDK, SDK, and a suitable Java compiler must also be installed.
-
-See the file 'java/INSTALL' for more details.
-
---
** Native compilation is now enabled by default.
'configure' will enable the Emacs Lisp native compiler, so long as
@@ -39,15 +32,12 @@ compilation, configure Emacs with the option:
./configure --with-native-compilation=no
----
-** Emacs now defaults to ossaudio library for sound on NetBSD and OpenBSD.
-Previously configure used ALSA libraries if installed on the
-system when configured '--with-sound=yes' (which is the default), with
-fallback to libossaudio. The libossaudio library included with the
-base system is now used even if ALSA is found to avoid relying on
-external packages and to resolve potential incompatibilities between
-Linux and BSD versions of ALSA. Use '--with-sound=alsa' to build with
-ALSA on these operating systems instead.
++++
+** Emacs has been ported to the Android operating system.
+This requires Emacs to be compiled on another computer. The Android
+NDK, SDK, and a suitable Java compiler must also be installed.
+
+See the file "java/INSTALL" for more details.
---
** Native JSON support is now always available; libjansson is no longer used.
@@ -55,9 +45,20 @@ No external library is required. The '--with-json' configure option has
been removed. 'json-available-p' now always returns non-nil and is only
kept for compatibility.
+---
+** Emacs now defaults to the ossaudio library for sound on NetBSD and OpenBSD.
+Previously, configure used ALSA libraries if installed on the system
+when configured '--with-sound=yes' (which is the default), with fallback
+to libossaudio. The libossaudio library included with the base system
+is now used even if ALSA is found to avoid relying on external packages
+and to resolve potential incompatibilities between GNU/Linux and *BSD
+versions of ALSA. Use '--with-sound=alsa' to build with ALSA on these
+operating systems instead.
+
* Startup Changes in Emacs 30.1
+---
** On GNU/Linux, Emacs is now the default application for 'org-protocol'.
Org mode provides a way to quickly capture bookmarks, notes, and links
using 'emacsclient':
@@ -71,18 +72,20 @@ arranges for Emacs to be the default application for the 'org-protocol'
URI scheme. See the Org mode manual, Info node "(org) Protocols" for
more details.
++++
+** New variable lets Lisp code read emacsclient arguments.
+When '--eval' is passed to emacsclient and Emacs is evaluating each
+argument, the new variable 'server-eval-args-left' is set to those
+arguments not yet evaluated. It can be used by Lisp code to 'pop'
+arguments and process them by the function called in the '--eval'
+expression, which is useful when those arguments contain arbitrary
+characters that otherwise might require elaborate and error-prone
+escaping (to protect them from the shell).
+
* Incompatible Changes in Emacs 30.1
-** Mouse wheel events should now always be 'wheel-up/down/left/right'.
-At those places where the old 'mouse-4/5/6/7' events could still occur
-(i.e., X11 input in the absence of XInput2, and 'xterm-mouse-mode'),
-we remap them to the corresponding 'wheel-up/down/left/right' event,
-according to the new variable 'mouse-wheel-buttons'.
-The old variables 'mouse-wheel-up-event', 'mouse-wheel-down-event',
-'mouse-wheel-left-event', and 'mouse-wheel-right-event' are thereby
-obsolete.
-
+---
** Tree-Sitter modes are now declared as submodes of the non-TS modes.
In order to help the use of those Tree-Sitter modes, they are now
declared to have the corresponding non-Tree-Sitter mode as an
@@ -93,17 +96,15 @@ collections of snippets automatically apply to the new Tree-Sitter modes.
Note that those modes still do not inherit from the non-TS mode, so
configuration settings installed via mode hooks are not affected.
-+++
-** URL now never sends user email addresses in HTTP requests.
-Emacs never sent email addresses by default, but it used to be
-possible to customize 'url-privacy-level' so that the users email
-address was sent along in HTTP requests. This feature has now been
-removed, as it was considered more dangerous than useful. RFC 9110
-(§ 10.1.2) also recommends against it. The user option
-'url-personal-mail-address' is now also obsolete.
-
-To send an email address in the header of individual HTTP requests,
-see the variable 'url-request-extra-headers'.
+---
+** Mouse wheel events should now always be 'wheel-up/down/left/right'.
+At those places where the old 'mouse-4/5/6/7' events could still occur
+(i.e., X11 input in the absence of XInput2, and 'xterm-mouse-mode'),
+we remap them to the corresponding 'wheel-up/down/left/right' event,
+according to the new user option 'mouse-wheel-buttons'.
+The old variables 'mouse-wheel-up-event', 'mouse-wheel-down-event',
+'mouse-wheel-left-event', and 'mouse-wheel-right-event' are thereby
+obsolete.
+++
** 'completion-auto-help' now affects 'icomplete-in-buffer'.
@@ -122,242 +123,173 @@ appear when using 'icomplete-in-buffer'. Now the "*Completions*" buffer
and Icomplete's in-buffer display of possible completions always
appear together. If you would prefer to see only Icomplete's
in-buffer display, and not the "*Completions*" buffer, you can add this
-to your init:
+to your init file:
(advice-add 'completion-at-point :after #'minibuffer-hide-completions)
+---
** The default process filter was rewritten in native code.
The round-trip through the Lisp function
'internal-default-process-filter' is skipped when the process filter is
-the default one. It's reimplemented in native code, reducing GC churn.
-
-To undo the change, set 'fast-read-process-output' to nil.
-
-
-* Changes in Emacs 30.1
-
-** 'describe-function' now shows the type of the function object.
-The text used to say things like "car is is a built-in function"
-whereas it now says "car is a primitive-function" where "primitive-function"
-is the symbol returned by 'cl-type-of' and you can click on it to get
-information about that type.
-
-** 'advice-remove' is now an interactive command.
-When called interactively, 'advice-remove' now prompts for an advised
-function to the advice to remove.
-
-** Emacs now supports Unicode Standard version 15.1.
-
-** New pre-defined values for 'electric-quote-chars'.
-The available customization options for 'electric-quote-chars' have been
-updated with common pairs of quotation characters, including "‘", "’",
-"“", "”", "«", "»", "‹", "›", "‚", "„", "「", "」", "『", and "』".
-The default is unchanged.
-
-** Network Security Manager
+the default one. It is reimplemented in native code, reducing GC churn.
+To undo this change, set 'fast-read-process-output' to nil.
+++
-*** The Network Security Manager now warns about 3DES by default.
+** The Network Security Manager now warns about 3DES by default.
This cypher is no longer recommended owing to a major vulnerability
disclosed in 2016, and its small 112 bit key size. Emacs now warns
about its use also when 'network-security-level' is set to 'medium'
(the default). See 'network-security-protocol-checks'.
---
-*** The Network Security Manager now warns about <2048 bits in DH key exchange.
+** The Network Security Manager now warns about <2048 bits in DH key exchange.
Emacs used to warn for Diffie-Hellman key exchanges with prime numbers
smaller than 1024 bits. Since more servers now support it, this
number has been bumped to 2048 bits.
-** Help
++++
+** URL now never sends user email addresses in HTTP requests.
+Emacs never sent email addresses by default, but it used to be
+possible to customize 'url-privacy-level' so that the users email
+address was sent along in HTTP requests. This feature has now been
+removed, as it was considered more dangerous than useful. RFC 9110
+(§ 10.1.2) also recommends against it. The user option
+'url-personal-mail-address' is now also obsolete.
+
+To send an email address in the header of individual HTTP requests,
+see the variable 'url-request-extra-headers'.
+
+
+* Changes in Emacs 30.1
+
+---
+** Emacs now supports Unicode Standard version 15.1.
+++
-*** New command 'help-find-source'.
-Switch to a buffer visiting the source of what is being described in
-"*Help*". It is bound to 'C-h 4 s' globally.
-
-*** 'describe-function' shows function inferred type when available.
-For native compiled Lisp functions 'describe-function' prints (after
-the signature) the automatically inferred function type as well.
-
----
-*** New user option 'describe-bindings-outline-rules'.
-This user option controls outline visibility in the output buffer of
-'describe-bindings' when 'describe-bindings-outline' is non-nil.
-
----
-*** 'C-h m' ('describe-mode') uses outlining by default.
-Set 'describe-mode-outline' to nil to get back the old behavior.
-
-*** 'C-h k' ('describe-key') shows Unicode name.
-For keybindings which produce single characters via translation or input
-methods, 'C-h k' now shows the Unicode name of the produced character in
-addition to the character itself, e.g.
-
-'C-h k C-x 8 E' =>
-
- € 'EURO SIGN' (translated from C-x 8 E)
-
-*** 'C-h b' ('describe-bindings') shows Unicode names.
-For keybindings which produce single characters via translation (such as
-those using the 'C-x 8' or 'A-' prefix, or 'dead-acute', 'dead-grave',
-etc), the Unicode names will now be shown in addition to the character
-itself, i.e.
-
- A-! ¡ INVERTED EXCLAMATION MARK
- A-$ ¤ CURRENCY SIGN
-
-and so on.
-
** Emacs now comes with Org v9.7.
See the file "etc/ORG-NEWS" for user-visible changes in Org.
-** Outline mode
-
-*** New commands to show/hide outlines by regexp.
-'/ h' ('outline-hide-by-heading-regexp') asks for a regexp and then
-hides the body lines of all outlines whose heading lines match the
-regexp. '/ s' ('outline-show-by-heading-regexp') does the same but
-shows the matched outlines.
++++
+** Improved support for touchscreen devices.
+On systems that understand them (at present X, Android, PGTK, and
+MS-Windows), many touch screen gestures are now implemented and
+translated into mouse or gesture events, and support for tapping tool
+bar buttons and opening menus has been added. Countless packages, such
+as Dired and Custom, have been adjusted to better understand touch
+screen input.
+++
-*** 'outline-minor-mode' is supported in tree-sitter major modes.
-It can be used in all tree-sitter major modes that set either the
-variable 'treesit-simple-imenu-settings' or 'treesit-outline-predicate'.
-
-** X selection requests are now handled much faster and asynchronously.
-This means it should be less necessary to disable the likes of
-'select-active-regions' when Emacs is running over a slow network
-connection.
-
-** Emacs now updates invisible frames that are made visible by a compositor.
-If an invisible or an iconified frame is shown to the user by the
-compositing manager, Emacs will now redisplay such a frame even though
-'frame-visible-p' returns nil or 'icon' for it. This can happen, for
-example, as part of preview for iconified frames.
+** Support for styled underline face attributes.
+These are implemented as new values of the 'style' attribute in a face
+underline specification, 'double-line', 'dots', and 'dashes', and are
+available on GUI systems. If your terminal's termcap or terminfo
+database entry defines the 'Su' or 'Smulx' capability, Emacs will also
+emit the prescribed escape sequence to render faces with such styles on
+TTY frames.
---
-** New user option 'menu-bar-close-window'.
-When non-nil, selecting "Close" from the "File" menu or clicking
-"Close" in the tool bar will result in the current window being
-closed, if possible.
+** Support for underline colors on TTY frames.
+Colors specified in the underline face will now also be displayed on TTY
+frames on terminals that support the 'Su' or 'Smulx' capabilities.
+++
-** 'write-region-inhibit-fsync' now defaults to t in interactive mode,
-as it has in batch mode since Emacs 24.
-
-+++
-** New user option 'remote-file-name-inhibit-delete-by-moving-to-trash'.
-When non-nil, this option suppresses moving remote files to the local
-trash when deleting. Default is nil.
-
----
-** New user option 'remote-file-name-inhibit-auto-save'.
-If this user option is non-nil, 'auto-save-mode' will not auto-save
-remote buffers. The default is nil.
-
-+++
-** New user option 'remote-file-name-access-timeout'.
-When a positive number, this option limits the call of 'access-file'
-for remote files to this number of seconds. Default is nil.
-
-+++
-** New user option 'yes-or-no-prompt'.
-This allows the user to customize the prompt that is appended by
-'yes-or-no-p' when asking questions. The default value is
-"(yes or no) ".
-
----
-** New face 'display-time-date-and-time'.
-This is used for displaying the time and date components of
-'display-time-mode'.
-
----
-** New icon images for general use.
-Several symbolic icons are added to "etc/images/symbols", including
-plus, minus, check-mark, star, etc.
-
-+++
-** Tool bars can now be placed on the bottom on more systems.
-The 'tool-bar-position' frame parameter can be set to 'bottom' on all
-window systems other than Nextstep.
-
-+++
-** New global minor mode 'modifier-bar-mode'.
-When this minor mode is enabled, buttons representing modifier keys
-are displayed along the tool bar.
-
-+++
-** New user option 'tool-bar-always-show-default'.
-When non-nil, the tool bar at the top of a frame does not show buffer
-local customization of the tool bar. The default value is nil.
-
-+++
-** "d" in the mode line now indicates that the window is dedicated.
-Windows have always been able to be dedicated to a specific buffer;
-see 'window-dedicated-p'. Now the mode line indicates the dedicated
-status of a window, with "d" appearing in the mode line if a window is
-dedicated and "D" if the window is strongly dedicated. This indicator
-appears before the buffer name, and after the buffer modification and
-remote buffer indicators (usually "---" together).
-
-+++
-** New command 'toggle-window-dedicated'.
-This makes it easy to interactively mark a specific window as
-dedicated, so it won't be reused by 'display-buffer'. This can be
-useful for complicated window setups. It is bound to 'C-x w d'
-globally.
-
----
-** New user option 'uniquify-dirname-transform'.
-This can be used to customize how buffer names are uniquified, by
-making arbitrary transforms on the buffer's directory name (whose
-components are used to uniquify buffer names when they clash). You
-can use this to distinguish between buffers visiting files with the
-same base name that belong to different projects by using the provided
-transform function 'project-uniquify-dirname-transform'.
-
-** 'insert-directory-program' is now a user option.
-On *BSD and macOS systems, this user option now defaults to the "gls"
-executable, if it exists. This should remove the need to change its
-value when installing GNU coreutils using something like ports or
-Homebrew.
-
-+++
-** CL Print
-
-+++
-*** You can expand the "..." truncation everywhere.
-The code that allowed "..." to be expanded in the "*Backtrace*" buffer
-should now work anywhere the data is generated by 'cl-print'.
-
-+++
-*** The 'backtrace-ellipsis' button is replaced by 'cl-print-ellipsis'.
-
-+++
-*** hash-tables' contents can be expanded via the ellipsis.
-
-+++
-*** Modes can control the expansion via 'cl-print-expand-ellipsis-function'.
-
-+++
-*** New setting 'raw' for 'cl-print-compiled'.
-This setting causes byte-compiled functions to be printed in full by
-'prin1'. A button on this output can be activated to disassemble the
-function.
-
-+++
-*** There is a new chapter in the CL manual documenting cl-print.el.
-See the Info node "(cl) Printing".
-
** Modeline elements can now be right-aligned.
Anything following the symbol 'mode-line-format-right-align' in
'mode-line-format' will be right-aligned. Exactly where it is
right-aligned to is controlled by the new user option
'mode-line-right-align-edge'.
+---
+** X selection requests are now handled much faster and asynchronously.
+This means it should be less necessary to disable the likes of
+'select-active-regions' when Emacs is running over a slow network
+connection.
+
+---
+** Emacs now updates invisible frames that are made visible by a compositor.
+If an invisible or an iconified frame is shown to the user by the
+compositing manager, Emacs will now redisplay such a frame even though
+'frame-visible-p' returns nil or 'icon' for it. This can happen, for
+example, as part of preview for iconified frames.
+
++++
+** Most file notification backends detect unmounting of a watched filesystem.
+The only exception is w32notify.
+
++++
+** The ':map' property of images is now recomputed when image is transformed.
+Images with clickable maps now work as expected after you run commands
+such as 'image-increase-size', 'image-decrease-size', 'image-rotate',
+'image-flip-horizontally', and 'image-flip-vertically'.
+Set the new user option 'image-recompute-map-p' to nil to prevent Emacs
+from recomputing image maps.
+
+** Minibuffer and Completions
+
++++
+*** New commands 'previous-line-completion' and 'next-line-completion'.
+Bound to '' and '' arrow keys, respectively, they navigate
+the "*Completions*" buffer vertically by lines, wrapping at the
+top/bottom when 'completion-auto-wrap' is non-nil.
+
++++
+*** New user option 'minibuffer-visible-completions'.
+When customized to non-nil, you can use arrow keys in the minibuffer
+to navigate the completions displayed in the "*Completions*" window.
+Typing 'RET' selects the highlighted candidate. 'C-g' hides the
+completions window. When the completions window is not visible,
+then all these keys have their usual meaning in the minibuffer.
+This option is supported for in-buffer completion as well.
+
+---
+*** Selected completion candidates are deselected on typing.
+When you type at the minibuffer prompt, the current completion
+candidate will be un-highlighted, and point in the "*Completions*" window
+will be moved off that candidate. 'minibuffer-choose-completion'
+('M-RET') will still choose a previously-selected completion
+candidate, but the new command 'minibuffer-choose-completion-or-exit'
+(bound to 'RET' by 'minibuffer-visible-completions') will exit with
+the minibuffer contents instead. This deselection behavior can be
+controlled with the new user option 'completion-auto-deselect', which
+is t by default.
+
++++
+*** New value 'historical' for user option 'completions-sort'.
+When 'completions-sort' is set to 'historical', completion candidates
+will be first sorted alphabetically, and then re-sorted by their order
+in the minibuffer history, with more recent candidates appearing first.
+
++++
+*** 'completion-category-overrides' supports more metadata.
+The new supported completion properties are 'cycle-sort-function',
+'display-sort-function', 'annotation-function', 'affixation-function',
+and 'group-function'. You can now customize them for any category in
+'completion-category-overrides' that will override the properties
+defined in completion metadata.
+
++++
+*** 'completion-extra-properties' supports more metadata.
+The new supported completion properties are 'category',
+'group-function', 'display-sort-function', and 'cycle-sort-function'.
+
** Windows
++++
+*** New command 'toggle-window-dedicated'.
+This makes it easy to interactively mark a specific window as
+dedicated, so it won't be reused by 'display-buffer'. This can be
+useful for complicated window setups. It is bound to 'C-x w d'
+globally.
+
++++
+*** "d" in the mode line now indicates that the window is dedicated.
+Windows have always been able to be dedicated to a specific buffer;
+see 'window-dedicated-p'. Now the mode line indicates the dedicated
+status of a window, with "d" appearing in the mode line if a window is
+dedicated and "D" if the window is strongly dedicated. This indicator
+appears before the buffer name, and after the buffer modification and
+remote buffer indicators (usually "---" together).
+
+++
*** New action alist entry 'some-window' for 'display-buffer'.
It specifies which window 'display-buffer-use-some-window' should prefer.
@@ -378,19 +310,13 @@ by adding '(category . symbol)' to the condition part of
It specifies whether the window of the displayed buffer should be
selected or deselected at the end of executing the current command.
----
-*** User option 'display-comint-buffer-action' is now obsolete.
-You can use a '(category . comint)' condition in 'display-buffer-alist'
-to match buffers displayed by comint-related commands. Another
-user option 'display-tex-shell-buffer-action' is obsolete too
-for which you can use '(category . tex-shell)'.
-
+++
*** New variable 'window-restore-killed-buffer-windows'.
It specifies how 'set-window-configuration' and 'window-state-put'
should proceed with windows whose buffer was killed after the
corresponding configuration or state was recorded.
+---
*** New variable 'window-point-context-set-function'.
It can be used to set a context for window point in all windows by
'window-point-context-set' before calling 'current-window-configuration'
@@ -407,6 +333,31 @@ according to the context stored in a window parameter.
are always created with a 'window-cursor-type' of t, which means to
consult the variable 'cursor-type' as before.
+---
+*** The user option 'display-comint-buffer-action' is now obsolete.
+You can use a '(category . comint)' condition in 'display-buffer-alist'
+to match buffers displayed by comint-related commands. Another
+user option 'display-tex-shell-buffer-action' is obsolete too
+for which you can use '(category . tex-shell)'.
+
+** Tool bars
+
++++
+*** Tool bars can now be placed on the bottom on more systems.
+The 'tool-bar-position' frame parameter can be set to 'bottom' on all
+window systems other than macOS and GNUstep (Nextstep).
+
++++
+*** New global minor mode 'modifier-bar-mode'.
+When this minor mode is enabled, the tool bar displays buttons
+representing modifier keys. Clicking on these buttons applies the
+corresponding modifiers to the next input event.
+
++++
+*** New user option 'tool-bar-always-show-default'.
+When non-nil, the tool bar at the top of a frame does not show buffer
+local customization of the tool bar. The default value is nil.
+
** Tab Bars and Tab Lines
---
@@ -428,6 +379,11 @@ the name of the killed buffer that was displayed in that window.
It can be used to add, remove and reorder functions that change the
appearance of every tab on the tab bar.
+---
+*** New user option 'tab-line-tabs-buffer-group-function'.
+It provides two choices to group tab buffers by major mode and by
+project name.
+
---
*** New hook 'tab-bar-tab-post-select-functions'.
@@ -454,86 +410,214 @@ original order of buffers on the tab line, even after switching between
these buffers. You can drag the tabs and release at a new position
to manually reorder the buffers on the tab line.
----
-*** New user option 'tab-line-tabs-buffer-group-function'.
-It provides two choices to group tab buffers by major mode and by
-project name.
-
---
*** Buffers on group tabs are now sorted alphabetically.
This will keep the fixed order of tabs, even after switching between
them.
-+++
-** New optional argument for modifying directory-local variables.
-The commands 'add-dir-local-variable', 'delete-dir-local-variable' and
-'copy-file-locals-to-dir-locals' now take an optional prefix argument,
-to enter the file name you want to modify.
+** Help
-** Emacs Server and Client
++++
+*** New command 'help-find-source'.
+Switch to a buffer visiting the source of what is being described in
+"*Help*". It is bound to 'C-h 4 s' globally.
---
-*** 'server-eval-args-left' can be used to pop and eval subsequent args.
-When '--eval' is passed to emacsclient and Emacs is evaluating each
-argument, this variable is set to those arguments not yet evaluated.
-It can be used to 'pop' arguments and process them by the function
-called in the '--eval' expression, which is useful when those
-arguments contain arbitrary characters that otherwise might require
-elaborate and error-prone escaping (to protect them from the shell).
+*** New user option 'describe-bindings-outline-rules'.
+This user option controls outline visibility in the output buffer of
+'describe-bindings' when 'describe-bindings-outline' is non-nil.
+
+---
+*** 'describe-function' shows the function inferred type when available.
+For native compiled Lisp functions, 'describe-function' prints (after
+the signature) the automatically inferred function type as well.
+
+---
+*** 'describe-function' now shows the type of the function object.
+The text used to say things like "car is a built-in function" whereas it
+now says "car is a primitive-function" where "primitive-function" is the
+the name of the symbol returned by 'cl-type-of'. You can click on those
+words to get information about that type.
+
+---
+*** 'C-h m' ('describe-mode') uses outlining by default.
+Set 'describe-mode-outline' to nil to get back the old behavior.
+
+---
+*** 'C-h k' ('describe-key') shows Unicode name.
+For keybindings which produce single characters via translation or input
+methods, 'C-h k' now shows the Unicode name of the produced character in
+addition to the character itself, e.g.
+
+'C-h k C-x 8 E' =>
+
+ € 'EURO SIGN' (translated from C-x 8 E)
+
+---
+*** 'C-h b' ('describe-bindings') shows Unicode names.
+For keybindings which produce single characters via translation (such as
+those using the 'C-x 8' or 'A-' prefix, or 'dead-acute', 'dead-grave',
+etc), the Unicode names will now be shown in addition to the character
+itself, i.e.
+
+ A-! ¡ INVERTED EXCLAMATION MARK
+ A-$ ¤ CURRENCY SIGN
+
+and so on.
+++
-** 'recover-file' can show diffs between auto save file and current file.
+*** Multi-character key echo now ends with a suggestion to use Help.
+Customize 'echo-keystrokes-help' to nil to prevent that.
+
+** Customize
+
++++
+*** New command 'customize-dirlocals'.
+This command pops up a buffer to edit the settings in ".dir-locals.el".
+
+---
+*** New command 'customize-toggle-option'.
+This command can toggle boolean options for the duration of a session.
+
++++
+*** New prefix argument for modifying directory-local variables.
+The commands 'add-dir-local-variable', 'delete-dir-local-variable' and
+'copy-file-locals-to-dir-locals' now take an optional prefix argument,
+to enter the file name where you want to modify directory-local
+variables.
+
++++
+*** New user option 'safe-local-variable-directories'.
+This user option names directories in which Emacs will treat all
+directory-local variables as safe.
+
++++
+** CL Print
+
++++
+*** There is a new chapter in the CL manual documenting cl-print.el.
+See the Info node "(cl) Printing".
+
++++
+*** You can expand the "..." truncation everywhere.
+The code that allowed "..." to be expanded in the "*Backtrace*" buffer
+should now work anywhere the data is generated by 'cl-print'.
+
++++
+*** The 'backtrace-ellipsis' button is replaced by 'cl-print-ellipsis'.
+
++++
+*** hash-tables' contents can be expanded via the ellipsis.
+
++++
+*** Modes can control the expansion via 'cl-print-expand-ellipsis-function'.
+
++++
+*** New setting 'raw' for 'cl-print-compiled'.
+This setting causes byte-compiled functions to be printed in full by
+'prin1'. A button on this output can be activated to disassemble the
+function.
+
+** Miscellaneous
+
++++
+*** New command 'kill-matching-buffers-no-ask'.
+This works like 'kill-matching-buffers', but without asking for
+confirmation.
+
++++
+*** 'recover-file' can show diffs between auto save file and current file.
When answering the prompt with "diff" or "=", it now shows the diffs
between the auto save file and the current file.
----
-** 'ffap-lax-url' now defaults to nil.
-Previously, it was set to t but this broke remote file name detection.
-
+++
-** Multi-character key echo now ends with a suggestion to use Help.
-Customize 'echo-keystrokes-help' to nil to prevent that.
+*** 'read-passwd' can toggle the visibility of passwords.
+Use 'TAB' in the minibuffer to show or hide the password.
+Alternatively, click the new show-password icon on the mode-line with
+'mouse-1' to toggle the visibility of the password.
-+++
-** 'read-passwd' can toggle the visibility of passwords.
-Use 'TAB' in the minibuffer to show or hide the password. Likewise,
-there is an icon on the mode-line, which toggles the visibility of the
-password when clicking with 'mouse-1'.
-
-+++
-** Support for styled underline face attributes.
-These are implemented as new values of the 'style' attribute in a face
-underline specification, 'double-line', 'dots', and 'dashes', and are
-available on GUI systems. If your terminal's termcap or terminfo
-database entry defines the 'Su' or 'Smulx' capability, Emacs will also
-emit the prescribed escape sequence to render faces with such styles on
-TTY frames.
+*** 'advice-remove' is now an interactive command.
+When called interactively, 'advice-remove' now prompts for an advised
+function to the advice to remove.
---
-** Support for underline colors on TTY frames.
-Colors specified in face underlines will now also be displayed in TTY
-frames with the previously mentioned capabilities.
+*** New user option 'uniquify-dirname-transform'.
+This can be used to customize how buffer names are uniquified, by
+making arbitrary transforms on the buffer's directory name (whose
+components are used to uniquify buffer names when they clash). You
+can use this to distinguish between buffers visiting files with the
+same base name that belong to different projects by using the provided
+transform function 'project-uniquify-dirname-transform'.
-** Miscellaneous
++++
+*** New user option 'remote-file-name-inhibit-delete-by-moving-to-trash'.
+When non-nil, this option suppresses moving remote files to the local
+trash when deleting. Default is nil.
+
+---
+*** New user option 'remote-file-name-inhibit-auto-save'.
+If this user option is non-nil, 'auto-save-mode' will not auto-save
+remote buffers. The default is nil.
+
++++
+*** New user option 'remote-file-name-access-timeout'.
+If a positive number, this option limits the call of 'access-file'
+for remote files to that number of seconds. Default is nil.
+
++++
+*** New user option 'yes-or-no-prompt'.
+This allows the user to customize the prompt that is appended by
+'yes-or-no-p' when asking questions. The default value is
+"(yes or no) ".
+
+---
+*** New user option 'menu-bar-close-window'.
+When non-nil, selecting "Close" from the "File" menu or clicking
+"Close" in the tool bar will result in the current window being
+deleted, if possible. The default is nil, and these gestures kill the
+buffer shown in the current window, but don't delete the window.
+
+---
+*** New face 'display-time-date-and-time'.
+This is used for displaying the time and date components of
+'display-time-mode'.
---
*** New face 'appt-notification' for 'appt-display-mode-line'.
It can be used to customize the look of the appointment notification
displayed on the mode line when 'appt-display-mode-line' is non-nil.
+---
+*** New icon images for general use.
+Several symbolic icons have been added to "etc/images/symbols",
+including plus, minus, check-mark, star, etc.
+
---
*** Emacs now recognizes shebang lines that pass '-S'/'--split-string' to 'env'.
When visiting a script that invokes 'env -S INTERPRETER ARGS...' in
its shebang line, Emacs will now skip over 'env -S' and deduce the
major mode based on the interpreter after 'env -S'.
-+++
-** New function 'sqlite-execute-batch'.
-This function lets the user execute multiple SQL statements in one go.
-It is useful, for example, when a Lisp program needs to evaluate an
-entire SQL file.
+*** 'insert-directory-program' is now a user option.
+On *BSD and macOS systems, this user option now defaults to the "gls"
+executable, if it exists. This should remove the need to change its
+value when installing GNU coreutils using something like ports or
+Homebrew.
+
++++
+*** 'write-region-inhibit-fsync' now defaults to t in interactive mode.
+This is the default in batch mode since Emacs 24.
+
+---
+*** The default value of 'read-process-output-max' was increased to 65536.
+
++++
+*** 'url-gateway-broken-resolution' is now obsolete.
+This option was intended for use on SunOS 4.x and Ultrix systems,
+neither of which have been supported by Emacs since version 23.1.
+The user option 'url-gateway-nslookup-program' and the command
+'url-gateway-nslookup-host' are consequently also obsolete.
-** The default value of 'read-process-output-max' was increased to 65536.
* Editing Changes in Emacs 30.1
@@ -552,16 +636,10 @@ buffers.
lightly edited for inclusion in Emacs.)
+++
-** New user option 'gud-highlight-current-line'.
-When enabled, Gud will visually emphasize the line being executed upon
-pauses in the debugee's execution, such as those occasioned by
-breakpoints being hit.
-
----
** New global minor mode 'kill-ring-deindent-mode'.
When enabled, text being saved to the kill ring will be de-indented by
the column number at its start. For example, saving the entire
-function call within:
+function call within an indented block:
foo ()
{
@@ -570,24 +648,62 @@ foo ()
argument_3_compute ());
}
-will save:
+will save this to the kill ring:
long_function_with_several_arguments (argument_1_compute (),
argument_2_compute (),
argument_3_compute ())
-to the kill ring, omitting the two columns of extra indentation that
-would otherwise be present in the second and third lines of the
-function call.
+This omits the two columns of extra indentation that would otherwise be
+copied from the second and third lines and saved to the kill ring.
+
+---
+** New command 'replace-regexp-as-diff'.
+It reads a regexp to search for and a string to replace with, then
+displays a buffer with replacements as diffs. After reviewing the
+changes in the output buffer you can apply the replacements as
+a patch to the current file buffer. There are also new commands
+'multi-file-replace-regexp-as-diff' that shows as diffs replacements
+in a list of specified files, and 'dired-do-replace-regexp-as-diff'
+that shows as diffs replacements in the marked files in Dired.
+++
-** Emacs now has better support for touchscreen devices.
-On systems that understand them (at present X, Android, PGTK, and
-MS-Windows), many touch screen gestures are now implemented and
-translated into mouse or gesture events, and support for tapping tool
-bar buttons and opening menus has been written. Countless packages,
-such as Dired and Custom have been adjusted to better understand touch
-screen input.
+** New mode of prompting for register names and showing preview.
+The new user option 'register-use-preview' can be customized to the
+value t or insist to request a different user interface of prompting for
+register names and previewing the registers: Emacs will require
+confirmation for overwriting the value of a register, and will show
+the preview of registers without delay. You can also customize this
+new option to disable the preview completely.
+
+The default value of 'register-use-preview' preserves the behavior of
+Emacs 29 and before. See the Info node "(emacs) Registers" for more
+details about the new UI and its variants.
+
++++
+** New advanced macro counter commands.
+New commands have been added to implement advanced macro counter
+functions.
+
+The commands 'C-x C-k C-r l' and 'C-x C-k C-r s' load and save the
+macro counter from and to a number register, respectively.
+
+The commands 'C-x C-k C-r a =', 'C-x C-k C-r a <', and 'C-x C-k C-r a >'
+compare the macro counter with the contents of a number register and
+increment the counter by an optional prefix if the comparison succeeds.
+
+The commands 'C-x C-k C-q =', 'C-x C-k C-q <', and 'C-x C-k C-q >'
+compare the macro counter with an optional prefix and terminate the
+macro if the comparison succeeds.
+
++++
+** New mode 'kmacro-menu-mode' and new command 'list-keyboard-macros'.
+The new command 'list-keyboard-macros' is the keyboard-macro version
+of commands like 'list-buffers' and 'list-processes', creating a listing
+of the currently existing keyboards macros using the new mode
+'kmacro-menu-mode'. It allows rearranging the macros in the ring,
+duplicating them, deleting them, and editing their counters, formats,
+and keys.
---
** On X, Emacs now supports input methods which perform "string conversion".
@@ -596,11 +712,6 @@ surrounding point and replace it with something else, as well as query
Emacs for surrounding text. If your input method allows you to "undo"
mistaken compositions, this will now work as well.
----
-** New command 'kill-matching-buffers-no-ask'.
-This works like 'kill-matching-buffers', but without asking for
-confirmation.
-
---
** New user option 'duplicate-region-final-position'.
It controls the placement of point and the region after duplicating a
@@ -617,8 +728,49 @@ whereas if the mouse pointer is in the left half of a glyph, point
will be put in front the buffer position corresponding to that glyph.
By default this is disabled.
+---
+** New pre-defined values for 'electric-quote-chars'.
+The available customization options for 'electric-quote-chars' have been
+updated with common pairs of quotation characters, including "‘", "’",
+"“", "”", "«", "»", "‹", "›", "‚", "„", "「", "」", "『", and "』".
+The default is unchanged.
+
++++
+** 'M-TAB' now invokes 'completion-at-point' in Text mode.
+By default, Text mode no longer binds 'M-TAB' to 'ispell-complete-word'.
+Instead, this mode arranges for 'completion-at-point', globally bound to
+'M-TAB', to perform word completion as well. You can have Text mode
+binding 'M-TAB' to 'ispell-complete-word' as it did in previous Emacs
+versions, or disable Ispell word completion in Text mode altogether, by
+customizing the new user option 'text-mode-ispell-word-completion'.
+
** Internationalization
+---
+*** Mode-line mnemonics for some coding-systems have changed.
+The mode-line mnemonic for 'utf-7' is now the lowercase 'u', to be
+consistent with the other encodings of this family.
+
+The mode-line mnemonic for 'koi8-u' is now 'У', U+0423 CYRILLIC
+CAPITAL LETTER U, to distinguish between this encoding and the
+UTF-8/UTF-16 family.
+
+If your terminal cannot display 'У', or if you want to get the old
+behavior back for any other reason, you can do that using the
+'coding-system-put' function. For example, the following restores the
+previous behavior of showing 'U' in the mode line for 'koi8-u':
+
+ (coding-system-put 'koi8-u :mnemonic ?U)
+
+---
+*** 'vietnamese-tcvn' is now a coding system alias for 'vietnamese-vscii'.
+VSCII-1 and TCVN-5712 are different names for the same character
+encoding. Therefore, the duplicate coding system definition has been
+dropped in favor of an alias.
+
+The mode-line mnemonic for 'vietnamese-vscii' and its aliases is the
+lowercase letter "v".
+
---
*** Users in CJK locales can control width of some non-CJK characters.
Some characters are considered by Unicode as "ambiguous" with respect
@@ -644,14 +796,17 @@ These languages are spoken in Pakistan and Afghanistan.
*** New input method "english-colemak".
This input method supports the Colemak keyboard layout.
+---
*** Additional 'C-x 8' key translations for "æ" and "Æ".
These characters can now be input with 'C-x 8 a e' and 'C-x 8 A E',
respectively, in addition to the existing translations 'C-x 8 / e' and
'C-x 8 / E'.
+---
*** New 'C-x 8' key translations for "low" quotes "„", and "‚".
These can now be entered with 'C-x , "' and 'C-x , ''.
+---
*** New German language 'C-x 8' key translations for quotation marks.
The characters "„", "“", and "”" can now be entered with 'C-x 8 v',
'C-x 8 b' and 'C-x 8 n'. The single versions "‚", "‘", and "’" can now
@@ -659,6 +814,7 @@ be entered with 'C-x 8 V', 'C-x 8 B' and 'C-x 8 N'. These characters
are used for the official German quoting style. Using them requires
activating German language support via 'iso-transl-set-language'.
+---
*** "latin-prefix" and "latin-postfix" quotation marks additions.
These input methods can now produce single, double and "low" left and
right quotation marks:
@@ -668,17 +824,20 @@ right quotation marks:
by using "[", "]", and "," for "left", "right", and "low" respectively
to modify "'" and """.
+---
*** "latin-prefix" and "latin-postfix" guillemets support.
These input methods can now produce single guillemets "‹" and "›". For
"latin-prefix" use "~~<" and "~~>", for "latin-postfix" use "<~" and
">~". Double guillemets ("«" and "»") were already supported.
+---
*** New French language 'C-x 8' key translations for "‹" and "›".
-These characters can now be entered using 'C-x 8 ~ <' and 'C-x 8 ~ >'
+These characters can now be entered using 'C-x 8 ~ <' and 'C-x 8 ~ >',
respectively, after activating French language support via
'iso-transl-set-language'. Double guillemets were already supported via
'C-x 8 <' and 'C-x 8 >'
+---
*** Additional 'C-x 8' key translation for Euro "€" currency symbol.
This can now be entered using 'C-x 8 E' in addition to the existing
'C-x 8 * E' translation.
@@ -686,28 +845,19 @@ This can now be entered using 'C-x 8 E' in addition to the existing
* Changes in Specialized Modes and Packages in Emacs 30.1
----
-** Titdic-cnv
-Most of the variables and functions in the file have been renamed to
-make sure they all use a 'tit-' namespace prefix.
-
----
-** Trace
-In batch mode, tracing now sends the trace to stdout.
+** Outline mode
+++
-** Mwheel
-The 'wheel-up/down/left/right' events are now bound unconditionally,
-and the 'mouse-wheel-up/down/left/right-event' variables are thus used
-only to specify the 'mouse-4/5/6/7' events that might still
-happen to be generated by some old packages (or if 'mouse-wheel-buttons'
-has been set to nil).
+*** New commands to show/hide outlines by regexp.
+'C-c / h' ('outline-hide-by-heading-regexp') asks for a regexp and then
+hides the body lines of all outlines whose heading lines match the
+regexp. 'C-c / s' ('outline-show-by-heading-regexp') does the inverse:
+it shows the bodies of outlines that matched a regexp.
-** Xterm Mouse mode
-This mode now emits 'wheel-up/down/right/left' events instead of
-'mouse-4/5/6/7' events for the mouse wheel.
-It uses the new variable 'mouse-wheel-buttons' to decide which button
-maps to which wheel event (if any).
++++
+*** 'outline-minor-mode' is supported in tree-sitter major modes.
+It can be used in all tree-sitter major modes that set either the
+variable 'treesit-simple-imenu-settings' or 'treesit-outline-predicate'.
** Info
@@ -718,14 +868,21 @@ This user option associates manual names with URLs. It affects the
Emacs-included manuals are set. Further associations can be added for
arbitrary Info manuals.
+---
*** Emacs can now display Info manuals compressed with 'lzip'.
This requires the 'lzip' program to be installed on your system.
-+++
-** New command 'lldb'.
-Run the LLDB debugger, analogous to the 'gud-gdb' command.
+** GUD (Grand Unified Debugger)
-** GDB MI
++++
+*** New user option 'gud-highlight-current-line'.
+When enabled, GUD will visually emphasize the line being executed upon
+pauses in the debuggee's execution, such as those occasioned by
+breakpoints being hit.
+
++++
+*** New command 'lldb'.
+Run the LLDB debugger, analogous to the 'gud-gdb' command.
---
*** Variable order and truncation can now be configured in 'gdb-many-windows'.
@@ -734,8 +891,8 @@ configure the order and max length of various properties in the local
variables buffer when using 'gdb-many-windows'.
By default, this user option is set to write the properties in the order:
-name, type and value, where the name and type are truncated to 20
-characters, and the value is truncated according to the value of
+'name', 'type' and 'value', where the 'name' and 'type' are truncated to 20
+characters, and the 'value' is truncated according to the value of
'gdb-locals-value-limit'.
If you want to get back the old behavior, set the user option to the value
@@ -743,21 +900,22 @@ If you want to get back the old behavior, set the user option to the value
(setopt gdb-locals-table-row-config
`((type . 0) (name . 0) (value . ,gdb-locals-value-limit)))
----
++++
*** New user option 'gdb-display-io-buffer'.
-If this is nil, 'M-x gdb' will neither create nor display a separate
+If this is nil, command 'gdb' will neither create nor display a separate
buffer for the I/O of the program being debugged, but will instead
redirect the program's interaction to the GDB execution buffer. The
default is t, to preserve previous behavior.
** Grep
++++
*** New user option 'grep-use-headings'.
When non-nil, the output of Grep is split into sections, one for each
file, instead of having file names prefixed to each line. It is
-equivalent to the "--heading" option of some tools such as 'git grep'
-and 'rg'. The headings are displayed using the new 'grep-heading'
-face.
+equivalent to the '--heading' option of some tools such as 'git grep'
+and 'rg'. The headings are displayed using the new 'grep-heading' face.
+The default is nil.
** Compilation mode
@@ -767,6 +925,7 @@ This is because it partly acts by modifying other rules which may
occasionally be surprising. It can be re-enabled by adding 'omake' to
'compilation-error-regexp-alist'.
+---
*** Lua errors and stack traces are now recognized.
Compilation mode now recognizes Lua language errors and stack traces.
Every Lua error is recognized as a compilation error, and every Lua
@@ -780,22 +939,26 @@ When non-nil, display the name of the current project on the mode
line. Clicking 'mouse-1' on the project name pops up the project
menu. The default value is nil.
+---
*** New user option 'project-file-history-behavior'.
Customizing it to 'relativize' makes commands like 'project-find-file'
and 'project-find-dir' display previous history entries relative to
the current project.
+--
*** New user option 'project-key-prompt-style'.
The look of the key prompt in the project switcher has been changed
slightly. To get the previous one, set this option to 'brackets'.
-*** 'project-try-vc' tries harder to find the responsible VCS.
+---
+*** Function 'project-try-vc' tries harder to find the responsible VCS.
When 'project-vc-extra-root-markers' is non-nil, and causes a
-subdirectory project to be detected which is not a VCS root, we now
-additionally traverse the parent directories until a VCS root is found
+subdirectory project to be detected which is not a VCS root, Project now
+additionally traverses the parent directories until a VCS root is found
(if any), so that the ignore rules for that repository are used, and
the file listing's performance is still optimized.
++++
*** New commands 'project-any-command' and 'project-prefix-or-any-command'.
The former is now bound to 'C-x p o' by default.
The latter is designed primarily for use as a value of
@@ -808,7 +971,7 @@ you can add this to your init script:
---
*** New variable 'project-files-relative-names'.
-If it's non-nil, 'project-files' can return file names relative to the
+If it is non-nil, 'project-files' can return file names relative to the
project root. Project backends can use this to improve the performance
of their 'project-files' implementation.
@@ -833,32 +996,34 @@ With this value only the revision number is displayed on the mode-line.
*** Obsolete command 'vc-switch-backend' re-added as 'vc-change-backend'.
The command was previously obsoleted and unbound in Emacs 28.
+---
*** Support for viewing VC change history across renames.
-When a fileset's VC change history ('C-x v l') ends at a rename, we
-now print the old name(s) and a button which jumps to their history.
-Git and Hg are supported. Naturally, 'vc-git-print-log-follow' should
-be nil for this to work (or '--follow' should not be in
-'vc-hg-print-log-switches', in Hg's case). Unlike when the '--follow'
-switch is used, commands to see the diff of the old revision ('d'),
-check out an old file version ('f') or annotate it right away ('a'),
-also work on revisions which precede renames.
+When a fileset's VC change history ends at a rename, 'C-x v l' now
+prints the old name(s) and shows a button which jumps to the history of
+the files under the old names. This feature is supported for Git and
+Hg. Naturally, 'vc-git-print-log-follow' should be nil for this to work
+(or '--follow' should not be in 'vc-hg-log-switches', in Hg's case).
+Unlike when the '--follow' switch is used, commands to see the diff of
+the old revision ('d'), to check out an old file version ('f') or to
+annotate it ('a'), also work on revisions which precede renames.
---
*** 'vc-annotate' now abbreviates the Git revision in the buffer name.
When using the Git backend, 'vc-annotate' will use an abbreviated
revision identifier in its buffer name. To restore the previous
-behavior, set 'vc-annotate-use-short-revision' to nil.
+behavior, set user option 'vc-annotate-use-short-revision' to nil.
-*** New option 'vc-git-file-name-changes-switches'.
+---
+*** New user option 'vc-git-file-name-changes-switches'.
It allows tweaking the thresholds for rename and copy detection.
** Diff mode
---
*** New user option 'diff-refine-nonmodified'.
-When this is non-nil, 'diff-refine' will highlight lines that were added
-or removed in their entirety (as opposed to modified lines, where some
-parts of the line were modified), using the same faces as for
+When this is non-nil, 'diff-refine-hunk' will highlight lines that were
+added or removed in their entirety (as opposed to modified lines, where
+some parts of the line were modified), using the same faces as for
highlighting the words added and removed within modified lines. The
default value is nil.
@@ -874,21 +1039,11 @@ This allows changing which type of whitespace changes are ignored when
regenerating hunks with 'diff-ignore-whitespace-hunk'. Defaults to
the previously hard-coded "-b".
++++
*** New command 'diff-apply-buffer' bound to 'C-c RET a'.
It applies the diff in the entire diff buffer and
saves all modified file buffers.
-** Isearch and Replace
-
-*** New command 'replace-regexp-as-diff'.
-It reads a regexp to search for and a string to replace with, then
-displays a buffer with replacements as diffs. After reviewing the
-changes in the output buffer you can apply the replacements as
-a patch to the current file buffer. There are also new commands
-'multi-file-replace-regexp-as-diff' that shows as diffs replacements
-in a list of specified files, and 'dired-do-replace-regexp-as-diff'
-that shows as diffs replacements in the marked files in Dired.
-
** Dired
---
@@ -899,13 +1054,15 @@ It also controls how to move point when encountering a boundary
(e.g., if every line is visible, invoking 'dired-next-line' at
the last line will move to the first line). The default is nil.
+---
*** New user option 'dired-filename-display-length'.
-It is an integer representing the maximum display length of filenames.
-The middle part of a filename whose length exceeds the restriction is
+It is an integer representing the maximum display length of file names.
+The middle part of a file name whose length exceeds the restriction is
hidden and an ellipsis is displayed instead. A value of 'window'
means using the right edge of window as the display restriction. The
default is nil.
+---
*** New user option 'shell-command-guess-functions'.
It defines how to populate a list of commands available
for 'M-!', 'M-&', '!', '&' and the context menu "Open With"
@@ -914,16 +1071,19 @@ based on marked files in Dired. Possible backends are
and a universal command such as "open" or "start"
that delegates to the OS.
++++
*** New command 'dired-do-open'.
This command is bound to 'E' (mnemonics "External"). Also it can be
used by clicking "Open" in the context menu; it "opens" the marked or
clicked on files according to the OS conventions. For example, on
systems supporting XDG, this runs 'xdg-open' on the files.
++++
*** New variable 'dired-guess-shell-alist-optional'.
It contains commands for external viewers and players for various media
formats, moved to this list from 'dired-guess-shell-alist-default'.
+---
*** The default value of 'dired-omit-size-limit' was increased.
After performance improvements to omitting in large directories, the new
default value is 300k, up from 100k. This means 'dired-omit-mode' will
@@ -934,21 +1094,6 @@ in size.
*** 'dired-listing-switches' handles connection-local values if exist.
This allows to customize different switches for different remote machines.
-** Registers
-
-+++
-*** New mode of prompting for register names and showing preview.
-The new user option 'register-use-preview' can be customized to the
-value t or insist to request a different user interface of prompting for
-register names and previewing the registers: Emacs will require
-confirmation for overwriting the value of a register, and will show
-the preview of registers without delay. You can also customize this
-new option to disable the preview completely.
-
-The default value of 'register-use-preview' preserves the behavior of
-Emacs 29 and before. See the Info node "(emacs) Registers" for more
-details about the new UI and its variants.
-
** Ediff
---
@@ -1081,7 +1226,7 @@ After manually editing 'eshell-aliases-file', you can use this command
to load the edited aliases.
+++
-*** 'rgrep' is now a builtin command.
+*** 'rgrep' is now a builtin Eshell command.
Running 'rgrep' in Eshell now uses the Emacs grep facility instead of
calling external rgrep.
@@ -1094,50 +1239,6 @@ If non-nil, each Eshell session will save history by appending new
entries of that session to the history file rather than overwriting
the file with the whole history of the session. The default is nil.
-** Minibuffer and Completions
-
-*** New commands 'previous-line-completion' and 'next-line-completion'.
-Bound to '' and '' arrow keys, respectively, they navigate
-the "*Completions*" buffer vertically by lines, wrapping at the
-top/bottom when 'completion-auto-wrap' is non-nil.
-
-*** New user option 'minibuffer-visible-completions'.
-When customized to non-nil, you can use arrow keys in the minibuffer
-to navigate the completions displayed in the "*Completions*" window.
-Typing 'RET' selects the highlighted candidate. 'C-g' hides the
-completions window. When the completions window is not visible,
-then all these keys have their usual meaning in the minibuffer.
-This option is supported for in-buffer completion as well.
-
-*** Selected completion candidates are deselected on typing.
-When you type at the minibuffer prompt, the current completion
-candidate will be un-highlighted, and point in the "*Completions*" window
-will be moved off that candidate. 'minibuffer-choose-completion'
-('M-RET') will still choose a previously-selected completion
-candidate, but the new command 'minibuffer-choose-completion-or-exit'
-(bound to 'RET' by 'minibuffer-visible-completions') will exit with
-the minibuffer contents instead. This deselection behavior can be
-controlled with the new user option 'completion-auto-deselect', which
-is t by default.
-
-*** New value 'historical' for user option 'completions-sort'.
-When 'completions-sort' is set to 'historical', completion candidates
-will be first sorted alphabetically, and then re-sorted by their order
-in the minibuffer history, with more recent candidates appearing first.
-
-+++
-*** 'completion-category-overrides' supports more metadata.
-The new supported completion properties are 'cycle-sort-function',
-'display-sort-function', 'annotation-function', 'affixation-function',
-and 'group-function'. You can now customize them for any category in
-'completion-category-overrides' that will override the properties
-defined in completion metadata.
-
-+++
-*** 'completion-extra-properties' supports more metadata.
-The new supported completion properties are 'category',
-'group-function', 'display-sort-function', and 'cycle-sort-function'.
-
** Pcomplete
---
@@ -1175,32 +1276,25 @@ output, reducing the time spent when printing large amounts of output.
To restore the old behavior, set 'comint-password-prompt-max-length' to
'most-positive-fixnum'.
-** Make mode
-
-*** The Makefile browser is now obsolete.
-The command 'makefile-switch-to-browser' command is now obsolete,
-together with related commands used in the "*Macros and Targets*"
-buffer. We recommend using an alternative like 'imenu' instead.
-
** Prog mode
+++
*** New command 'prog-fill-reindent-defun'.
This command either fills a single paragraph in a defun, such as a
-docstring, or a comment, or (re)indents the surrounding defun if
-point is not in a comment or a string. It is by default bound to
-'M-q' in 'prog-mode' and all its descendants.
+docstring, or a comment, or (re)indents the surrounding defun if point
+is not in a comment or a string. By default, it is bound to 'M-q' in
+'prog-mode' and all its descendants.
** Imenu
+++
*** New user option 'imenu-flatten'.
-It controls whether to flatten the list of sections in an imenu, and
+It controls whether to flatten the list of sections in an imenu, and
how to display the sections in the flattened list.
+++
*** The sort order of Imenu completions can now be customized.
-You can customize the option 'completion-category-overrides'
+You can customize the user option 'completion-category-overrides'
and set 'display-sort-function' for the category 'imenu'.
** Which Function mode
@@ -1312,11 +1406,6 @@ manual "(tramp) Improving performance of asynchronous remote processes".
When a direct asynchronous process is invoked, it uses 'tramp-remote-path'
for setting the remote 'PATH' environment variable.
-** File Notifications
-
-+++
-*** All backends except w32notify detect unmounting of a watched filesystem now.
-
** EWW
---
@@ -1386,13 +1475,13 @@ prefix argument, it always displays the readable parts, and with a zero
or negative prefix, it always displays the full page.
+++
-*** New option 'eww-readable-urls'.
+*** New user option 'eww-readable-urls'.
This is a list of regular expressions matching the URLs where EWW should
display only the readable parts by default. For more details, see
"(eww) Basics" in the EWW manual.
---
-*** New option 'eww-readable-adds-to-history'.
+*** New user option 'eww-readable-adds-to-history'.
When non-nil (the default), calling 'eww-readable' adds a new entry to
the EWW page history.
@@ -1513,10 +1602,12 @@ mouse to consult an error message.
** Flyspell
++++
*** New user option 'flyspell-check-changes'.
When non-nil, Flyspell mode spell-checks only words that you edited; it
does not check unedited words just because you move point across them.
+---
** JS mode.
The binding 'M-.' has been removed from the major mode keymaps in
'js-mode' and 'js-ts-mode', having it default to the global binding
@@ -1524,6 +1615,7 @@ which calls 'xref-find-definitions'. If the previous one worked
better for you, use 'define-key' in your init script to bind
'js-find-symbol' to that combination again.
+---
** Json mode.
'js-json-mode' does not derive from 'js-mode' any more so as not
to confuse tools like Eglot or YASnippet into thinking that those
@@ -1547,10 +1639,12 @@ instead of:
and another_expression):
do_something()
+---
*** New user option 'python-interpreter-args'.
This allows the user to specify command line arguments to the non
interactive Python interpreter specified by 'python-interpreter'.
+---
*** New function 'python-shell-send-block'.
It sends the python block delimited by 'python-nav-beginning-of-block'
and 'python-nav-end-of-block' to the inferior Python process.
@@ -1560,19 +1654,28 @@ and 'python-nav-end-of-block' to the inferior Python process.
---
*** Default value of 'python-shell-compilation-regexp-alist' is changed.
Support for Python's ExceptionGroup has been added, so in the Python
-shell, the line indicating the source of error in the error messages
+shell, the line indicating the source of an error in the error messages
from ExceptionGroup will be recognized as well.
-** Scheme mode
-Scheme mode now handles regular expression literal '#/regexp/' that is
-available in some Scheme implementations.
+** Eldoc
+
+---
+*** 'eldoc' no longer truncates to a single line by default.
+Previously, the entire docstring was not available to eldoc, which made
+'eldoc-echo-area-use-multiline-p' ineffective. The old behavior may be
+kept by customizing 'eldoc-echo-area-use-multiline-p'.
+
+---
+** Scheme mode.
+Scheme mode now handles the regular expression literal '#/regexp/' that
+is available in some Scheme implementations.
Also, it should now handle nested sexp-comments.
** Use package
+++
*** New ':vc' keyword.
-This keyword enables the user to install packages using 'package-vc'.
+This keyword enables the user to install packages using package-vc.el.
+++
*** New user option 'use-package-vc-prefer-newest'.
@@ -1594,7 +1697,7 @@ servers.
*** The 'nnweb-type' option 'gmane' has been removed.
The gmane.org website is, sadly, down since a number of years with no
prospect of it coming back. Therefore, it is no longer valid to set
-the user option 'nnweb-type' to 'gmane'.
+the server variable 'nnweb-type' to 'gmane'.
---
*** New user option 'gnus-mode-line-logo'.
@@ -1626,7 +1729,7 @@ provide dictionary-based minibuffer completion for word selection.
*** New user option 'dictionary-read-word-prompt'.
This allows the user to customize the prompt that is used by
'dictionary-search' when asking for a word to search in the
-dictionary.
+dictionaries.
---
*** New user option 'dictionary-display-definition-function'.
@@ -1665,13 +1768,19 @@ the mode was turned on.
** Pp
++++
*** New 'pp-default-function' user option replaces 'pp-use-max-width'.
+Its default value is 'pp-fill', a new default pretty-printing function,
+which tries to obey 'fill-column'.
-*** New default pretty printing function, which tries to obey 'fill-column'.
-
+---
*** 'pp-to-string' takes an additional PP-FUNCTION argument.
This argument specifies the prettifying algorithm to use.
+---
+*** 'pp' and 'pp-to-string' now always include a terminating newline.
+In the past they included a terminating newline in most cases but not all.
+
** Emacs Lisp mode
---
@@ -1680,7 +1789,7 @@ Previously, the '@' character, which normally has 'symbol' syntax,
would combine with a following Lisp symbol and interfere with symbol
searching.
----
++++
*** 'emacs-lisp-docstring-fill-column' now defaults to 72.
It was previously 65. The new default formats documentation strings to
fit on fewer lines without negatively impacting readability.
@@ -1692,10 +1801,12 @@ fit on fewer lines without negatively impacting readability.
CPerl mode fontifies subroutine signatures like variable declarations
which makes them visually distinct from subroutine prototypes.
+---
*** Syntax of Perl up to version 5.40 is supported.
CPerl mode supports the new keywords for exception handling and the
object oriented syntax which were added in Perl 5.36, 5.38 and 5.40.
+---
*** New user option 'cperl-fontify-trailer'.
This user option takes the values 'perl-code' or 'comment' and treats
text after an "__END__" or "__DATA__" token accordingly. The default
@@ -1703,21 +1814,25 @@ value of 'perl-code' is useful for trailing POD and for AutoSplit
modules, the value 'comment' makes CPerl mode treat trailers as
comment, like Perl mode does.
+---
*** New command 'cperl-file-style'.
This command sets the indentation style for the current buffer. To
change the default style, either use the user option with the same name
or use the command 'cperl-set-style'.
-*** New minor mode cperl-extra-paired-delimiters-mode
+---
+*** New minor mode 'cperl-extra-paired-delimiters-mode'.
Perl 5.36 and newer allows using more than 200 non-ASCII paired
-delimiters for quote-like constructs, eg. "q«text»". Use this minor
+delimiters for quote-like constructs, e.g. "q«text»". Use this minor
mode in buffers where this feature is activated.
-*** Commands using the Perl info page are obsolete.
-The Perl documentation in info format is no longer distributed with
+---
+*** Commands using the Perl Info manual are obsolete.
+The Perl documentation in Info format is no longer distributed with
Perl or on CPAN since more than 10 years. Perl documentation can be
read with 'cperl-perldoc' instead.
+---
*** Highlighting trailing whitespace has been removed.
The user option 'cperl-invalid-face' is now obsolete, and does
nothing. See the user option 'show-trailing-whitespace' instead.
@@ -1741,38 +1856,17 @@ Similarly to buffer restoration by Desktop, 'recentf-mode' checking
of the accessibility of remote files can now time out if
'remote-file-name-access-timeout' is set to a positive number.
-** Notifications
-
-+++
-*** Allow using Icon Naming Specification for ':app-icon'.
-You can use a symbol as the value for ':app-icon' to provide icon name
-without specifying a file, like this:
-
- (notifications-notify
- :title "I am playing music" :app-icon 'multimedia-player)
-
-** Image
-
-+++
-*** Image ':map' property is now recomputed when image is transformed.
-Now images with clickable maps work as expected after you run commands
-such as 'image-increase-size', 'image-decrease-size', 'image-rotate',
-'image-flip-horizontally', and 'image-flip-vertically'.
-
-+++
-*** New user option 'image-recompute-map-p'.
-Set this option to nil to prevent Emacs from recomputing image maps.
-
** Image Dired
++++
*** New user option 'image-dired-thumb-naming'.
-You can now configure how a thumbnail is named using this option.
+You can now configure how thumbnails are named using this option.
** ERT
+++
*** New macro 'skip-when' to skip 'ert-deftest' tests.
-This can help avoid some awkward skip conditions. For example
+This can help to avoid some awkward skip conditions. For example
'(skip-unless (not noninteractive))' can be changed to the easier
to read '(skip-when noninteractive)'.
@@ -1782,15 +1876,6 @@ An ERT extension ('ert-font-lock') now provides support for face
assignment unit testing. For more information, see the "(ert) Syntax
Highlighting Tests" node in the ERT manual.
-** URL
-
-+++
-*** 'url-gateway-broken-resolution' is now obsolete.
-This option was intended for use on SunOS 4.x and Ultrix systems,
-neither of which have been supported by Emacs since version 23.1.
-The user option 'url-gateway-nslookup-program' and the function
-'url-gateway-nslookup-host' are consequently also obsolete.
-
** Socks
+++
@@ -1813,54 +1898,6 @@ When this is non-nil, the lines of key sequences are displayed with
the most recent line first. This is can be useful when working with
macros with many lines, such as from 'kmacro-edit-lossage'.
-** Proced
-
----
-*** More control on automatic update of Proced buffers.
-The user option 'proced-auto-update-flag' can now be set to 2 additional
-values, which control automatic updates of Proced buffers that are not
-displayed in some window.
-
-** Kmacro
-
-+++
-*** New Advanced Macro Counter functions.
-New commands have been added to implement advanced macro counter
-functions.
-
-The commands 'C-x C-k C-r l' and 'C-x C-k C-r s' load and save the
-macro counter from and to a number register, respectively.
-
-The commands 'C-x C-k C-r a =', 'C-x C-k C-r a <', and
-'C-x C-k C-r a >' compare the macro counter with the contents of a
-number register and increment the counter by an optional prefix if the
-comparison succeeds.
-
-The commands 'C-x C-k C-q =', 'C-x C-k C-q <', and 'C-x C-k C-q >'
-compare the macro counter with an optional prefix and terminate the
-macro if the comparison succeeds.
-
-** Kmacro Menu mode
-
-+++
-*** New mode 'kmacro-menu-mode' and new command 'list-keyboard-macros'.
-The new command 'list-keyboard-macros' is the keyboard-macro version
-of commands like 'list-buffers' and 'list-processes', creating a listing
-of the currently existing keyboards macros using the new mode
-'kmacro-menu-mode'. It allows rearranging the macros in the ring,
-duplicating them, deleting them, and editing their counters, formats,
-and keys.
-
-** Customize
-
-+++
-*** New command 'customize-dirlocals'.
-This command pops up a buffer to edit the settings in ".dir-locals.el".
-
----
-** New command 'customize-toggle-option'.
-This command can toggle boolean options for the duration of a session.
-
** Calc
+++
@@ -1868,10 +1905,10 @@ This command can toggle boolean options for the duration of a session.
Fractions of the form "123⁄456" are handled as if written "123:456".
Note in particular the difference in behavior from U+2215 DIVISION SLASH
and U+002F SOLIDUS, which result in division rather than a rational
-fraction. You may also be interested to know that precomposed fraction
-characters, such as ½ (U+00BD VULGAR FRACTION ONE HALF), are also
-recognized as rational fractions. They have been since 2004, but it
-looks like it was never mentioned in the NEWS, or even the manual.
+fraction. In addition, precomposed fraction characters, such as ½
+(U+00BD VULGAR FRACTION ONE HALF), are also recognized as rational
+fractions. (They have been recognized since 2004, but it looks like it
+was never mentioned in the NEWS, or even the Calc manual.)
** IELM
@@ -1889,21 +1926,14 @@ This allows the user to customize the key selection method, which can be
either by using a pop-up buffer or from the minibuffer. The pop-up
buffer method is the default, which preserves previous behavior.
-** Xwidget Webkit
+** Widget
+++
-*** New user option 'xwidget-webkit-disable-javascript'.
-This allows disabling JavaScript in xwidget Webkit sessions.
-
-** Ls Lisp
-
----
-*** 'ls-lisp--insert-directory' supports more long options of 'ls'.
-'ls-lisp--insert-directory', the ls-lisp implementation of
-'insert-directory', now supports the '--time=TIME' and '--sort=time'
-options of GNU 'ls'.
-
-** Widget
+*** New face 'widget-unselected'.
+Customize this face to a non-default value to visually distinguish the
+labels of unselected active radio-button or checkbox widgets from the
+labels of unselected inactive widgets (the default value inherits from
+the 'widget-inactive' face).
+++
*** New user option 'widget-skip-inactive'.
@@ -1912,6 +1942,7 @@ If non-nil, moving point forward or backward between widgets by typing
** Ruby mode
+---
*** New user option 'ruby-rubocop-use-bundler'.
By default it retains the previous behavior: read the contents of
Gemfile and act accordingly. But you can also set it to t or nil to
@@ -1929,8 +1960,8 @@ of 'bounds-of-thing-at-point' and 'forward-thing', respectively.
*** New helper functions for text property-based thingatpt providers.
The new helper functions 'thing-at-point-for-char-property',
'bounds-of-thing-at-point-for-char-property', and
-'forward-thing-for-char-property' can help to help implement custom
-thingatpt providers for "things" that are defined by a text property.
+'forward-thing-for-char-property' can help to implement custom thingatpt
+providers for "things" that are defined by text properties.
---
*** 'bug-reference-mode' now supports 'thing-at-point'.
@@ -1939,15 +1970,9 @@ will return the URL for that bug.
** Miscellaneous
----
-*** Webjump now assumes URIs are HTTPS instead of HTTP.
-For links in 'webjump-sites' without an explicit URI scheme, it was
-previously assumed that they should be prefixed with "http://". Such
-URIs are now prefixed with "https://" instead.
-
+++
*** New user option 'rcirc-log-time-format'.
-This allows for rcirc logs to use a custom timestamp format, than the
+This allows for rcirc logs to use a custom timestamp format, which the
chat buffers use by default.
---
@@ -1963,6 +1988,16 @@ that is, buffers not visiting a file and whose names start with a space.
Previously, such buffers were never shown. This command is bound to 'I'
in Buffer Menu mode.
+---
+*** 'ffap-lax-url' now defaults to nil.
+Previously, it was set to t, but this broke remote file name detection.
+
+---
+*** More control on automatic update of Proced buffers.
+The user option 'proced-auto-update-flag' can now be set to two
+additional values, which control automatic updates of Proced buffers
+that are not displayed in some window.
+
---
*** nXML Mode now comes with schemas for Mono/.NET development.
The following new XML schemas are now supported:
@@ -1974,16 +2009,74 @@ The following new XML schemas are now supported:
- Nuget package specification file
- Nuget packages config file
-** color.el now supports the Oklab color representation.
+---
+*** color.el now supports the Oklab color representation.
+
++++
+*** New user option 'xwidget-webkit-disable-javascript'.
+This allows disabling JavaScript in xwidget Webkit sessions.
---
-** 'M-x ping' can now give "ping" additional flags.
+*** 'ls-lisp--insert-directory' supports more long options of 'ls'.
+'ls-lisp--insert-directory', the ls-lisp implementation of
+'insert-directory', now supports the '--time=TIME' and '--sort=time'
+options of GNU 'ls'.
+
+---
+*** 'M-x ping' can now give additional flags to the 'ping' program.
Typing 'C-u M-x ping' prompts first for the host, and then for the flags
-to give to "ping".
+to give to the 'ping' command.
+
+---
+*** Webjump now assumes URIs are HTTPS instead of HTTP.
+For links in 'webjump-sites' without an explicit URI scheme, it was
+previously assumed that they should be prefixed with "http://". Such
+URIs are now prefixed with "https://" instead.
+
+---
+*** Added prefixes in titdic-cnv library.
+Most of the variables and functions in the file have been renamed to
+make sure they all use a 'tit-' namespace prefix.
+
+---
+*** 'xref-revert-buffer' is now an alias of 'revert-buffer'.
+The Xref buffer now sets up 'revert-buffer-function' such that
+'revert-buffer' behaves like 'xref-revert-buffer' did in previous Emacs
+versions, and the latter is now an alias of the former.
+
+---
+*** The Makefile browser is now obsolete.
+The command 'makefile-switch-to-browser' command is now obsolete,
+together with related commands used in the "*Macros and Targets*"
+buffer. We recommend using an alternative like 'imenu' instead.
* New Modes and Packages in Emacs 30.1
+** New major modes based on the tree-sitter library
+
++++
+*** New major mode 'elixir-ts-mode'.
+A major mode based on the tree-sitter library for editing Elixir files.
+
++++
+*** New major mode 'heex-ts-mode'.
+A major mode based on the tree-sitter library for editing HEEx files.
+
++++
+*** New major mode 'html-ts-mode'.
+An optional major mode based on the tree-sitter library for editing
+HTML files.
+
++++
+*** New major mode 'lua-ts-mode'.
+A major mode based on the tree-sitter library for editing Lua files.
+
++++
+*** New major mode 'php-ts-mode'.
+A major mode based on the tree-sitter library for editing PHP files.
+
++++
** New package EditorConfig.
This package provides support for the EditorConfig standard,
an editor-neutral way to provide directory local (project-wide) settings.
@@ -1993,7 +2086,38 @@ There is also a new major mode 'editorconfig-conf-mode'
to edit those configuration files.
+++
-** New package Track-Changes.
+** New global minor mode 'etags-regen-mode'.
+This minor mode generates the tags table automatically based on the
+current project configuration, and later updates it as you edit the
+files and save the changes.
+
++++
+** New package 'which-key'.
+The 'which-key' package from GNU ELPA is now included in Emacs. It
+implements the global minor mode 'which-key-mode' that displays a table
+of key bindings upon entering a partial key chord and waiting for a
+moment. For example, after enabling the minor mode, if you enter 'C-x'
+and wait for one second, the minibuffer will expand with all available
+key bindings that follow 'C-x' (or as many as space allows).
+
++++
+** New minor mode 'completion-preview-mode'.
+This minor mode shows you symbol completion suggestions as you type,
+using an inline preview. New user options in the 'completion-preview'
+customization group control exactly when Emacs displays this preview.
+'completion-preview-mode' is buffer-local, to enable it globally use
+'global-completion-preview-mode'.
+
++++
+** New package Window-Tool-Bar.
+This provides a new minor mode, 'window-tool-bar-mode'. When this minor
+mode is enabled, a tool bar is displayed at the top of a window. To
+conserve space, no tool bar is shown if 'tool-bar-map' is nil. The
+global minor mode 'global-window-tool-bar-mode' enables this minor mode
+in all buffers.
+
++++
+** New library Track-Changes.
This library is a layer of abstraction above 'before-change-functions'
and 'after-change-functions' which provides a superset of
the functionality of 'after-change-functions':
@@ -2004,46 +2128,13 @@ the functionality of 'after-change-functions':
reported (calls to 'before/after-change-functions' that are
incorrectly paired, missing, etc...) and reports them adequately.
-** New major modes based on the tree-sitter library
-
+++
-*** New major mode 'html-ts-mode'.
-An optional major mode based on the tree-sitter library for editing
-HTML files.
-
-+++
-*** New major mode 'heex-ts-mode'.
-A major mode based on the tree-sitter library for editing HEEx files.
-
-+++
-*** New major mode 'elixir-ts-mode'.
-A major mode based on the tree-sitter library for editing Elixir files.
-
-+++
-*** New major mode 'lua-ts-mode'.
-A major mode based on the tree-sitter library for editing Lua files.
-
-+++
-*** New major mode 'php-ts-mode'.
-A major mode based on the tree-sitter library for editing PHP files.
-
-
-** Minibuffer and Completions
-
-+++
-*** New global minor mode 'minibuffer-regexp-mode'.
-This is a minor mode for editing regular expressions in the minibuffer.
-It highlights parens via ‘show-paren-mode’ and ‘blink-matching-paren’ in
-a user-friendly way, avoids reporting alleged paren mismatches and makes
-sexp navigation more intuitive.
-
-+++
-*** New minor mode 'completion-preview-mode'.
-This minor mode shows you symbol completion suggestions as you type,
-using an inline preview. New user options in the 'completion-preview'
-customization group control exactly when Emacs displays this preview.
-'completion-preview-mode' is buffer-local, to enable it globally use
-'global-completion-preview-mode'.
+** New global minor mode 'minibuffer-regexp-mode'.
+This is a minor mode for editing regular expressions in the minibuffer,
+for example in 'query-replace-regexp'. It correctly highlights parens
+via 'show-paren-mode' and 'blink-matching-paren' in a user-friendly way,
+avoids reporting alleged paren mismatches and makes sexp navigation more
+intuitive.
---
** The highly accessible Modus themes collection has eight items.
@@ -2055,13 +2146,22 @@ dark. In addition to these, we now have 'modus-operandi-tinted' and
'modus-operandi-tritanopia', and 'modus-vivendi-tritanopia' to cover
the needs of users with red-green or blue-yellow color deficiency.
The Info manual "(modus-themes) Top" describes the details and
-showcases all their customization options.
+showcases all their user options.
+++
-** New global minor mode 'etags-regen-mode'.
-This minor mode generates the tags table automatically based on the
-current project configuration, and later updates it as you edit the
-files and save the changes.
+** New library PEG.
+Emacs now includes a library for writing Parsing Expression
+Grammars (PEG), an approach to text parsing that provides more structure
+than regular expressions, but less complexity than context-free
+grammars. The Info manual "(elisp) Parsing Expression Grammars" has
+documentation and examples.
+
+---
+** New major mode 'shell-command-mode'.
+This mode is used by default for the output of asynchronous 'shell-command'.
+To revert to the previous behavior, set the (also new) variable
+'async-shell-command-mode' to 'shell-mode'. Any hooks or mode-specific
+variables used should be adapted appropriately.
+++
** New package Compat.
@@ -2070,41 +2170,9 @@ forwards-compatibility Compat package from GNU ELPA. This allows
built-in packages to use the library more effectively, and helps
preventing the installation of Compat if unnecessary.
-+++
-** New package PEG.
-Emacs now includes a library for writing Parsing Expression
-Grammars (PEG), an approach to text parsing that provides more structure
-than regular expressions, but less complexity than context-free
-grammars. The Info manual "(elisp) Parsing Expression Grammars" has
-documentation and examples.
-
-** New major mode 'shell-command-mode'.
-This mode is used by default for the output of asynchronous 'shell-command'.
-To revert to the previous behavior, set the (also new) variable
-'async-shell-command-mode' to 'shell-mode'. Any hooks or mode-specific
-variables used should be adapted appropriately.
-
-+++
-** New package Window-Tool-Bar.
-This provides a new minor mode, 'window-tool-bar-mode'. When this minor
-mode is enabled, a tool bar is displayed at the top of a window. To
-conserve space, no tool bar is shown if 'tool-bar-map' is nil. The
-global minor mode 'global-window-tool-bar-mode' enables this minor mode
-in all buffers.
-
-+++
-** New package Which-Key
-The 'which-key' package from GNU ELPA is now included in Emacs. It
-implements the 'which-key-mode' that displays a table of key bindings
-upon entering a partial key chord and waiting for a moment.
-
* Incompatible Lisp Changes in Emacs 30.1
----
-** 'subr-native-elisp-p' is renamed to 'native-comp-function-p'.
-The previous name still exists but is marked as obsolete.
-
+++
** Evaluating a 'lambda' returns an object of type 'interpreted-function'.
Instead of representing interpreted functions as lists that start with
@@ -2122,6 +2190,16 @@ no longer work and will need to use 'aref' instead to extract its
various subparts (when 'interactive-form', 'documentation', and
'help-function-arglist' aren't adequate).
+---
+** The escape sequence '\x' not followed by hex digits is now an error.
+Previously, '\x' without at least one hex digit denoted character code
+zero (NUL) but as this was neither intended nor documented or even
+known by anyone, it is now treated as an error by the Lisp reader.
+
+---
+** 'subr-native-elisp-p' is renamed to 'native-comp-function-p'.
+The previous name still exists but is marked as obsolete.
+
+++
** 'define-globalized-minor-mode' requires that modes use 'run-mode-hooks'.
Minor modes defined with 'define-globalized-minor-mode', such as
@@ -2130,60 +2208,22 @@ whose major modes fail to use 'run-mode-hooks'. Major modes defined
with 'define-derived-mode' are not affected. 'run-mode-hooks' has been the
recommended way to run major mode hooks since Emacs 22.
----
-** Old derived.el functions removed.
-The following functions have been deleted because they were only used
-by code compiled with Emacs<21:
-'derived-mode-init-mode-variables', 'derived-mode-merge-abbrev-tables',
-'derived-mode-merge-keymaps', 'derived-mode-merge-syntax-tables',
-'derived-mode-run-hooks', 'derived-mode-set-abbrev-table',
-'derived-mode-set-keymap', 'derived-mode-set-syntax-table',
-'derived-mode-setup-function-name'.
-
+++
-** 'M-TAB' now invokes 'completion-at-point' also in Text mode.
-By default, Text mode no longer binds 'M-TAB' to
-'ispell-complete-word'. Instead, this mode arranges for
-'completion-at-point', globally bound to 'M-TAB', to perform word
-completion as well. You can have Text mode bind 'M-TAB' to
-'ispell-complete-word' as it did in previous Emacs versions, or
-disable Ispell word completion in Text mode altogether, by customizing
-the new user option 'text-mode-ispell-word-completion'.
-
-** 'pp' and 'pp-to-string' now always include a terminating newline.
-In the past they included a terminating newline in most cases but not all.
-
-** 'buffer-match-p' and 'match-buffers' take '&rest args'.
-They used to take a single '&optional arg' and were documented to use
+** 'buffer-match-p' and 'match-buffers' take '&rest ARGS'.
+They used to take a single '&optional ARG' and were documented to use
an unreliable hack to try and support condition predicates that
-don't accept this optional arg.
+don't accept this optional ARG.
The new semantics makes no such accommodation, but the code still
supports it (with a warning) for backward compatibility.
-** 'post-gc-hook' runs after updating 'gcs-done' and 'gcs-elapsed'.
+---
+** 'post-gc-hook' runs after updating 'gcs-done' and 'gc-elapsed'.
---
-** The escape sequence '\x' not followed by hex digits is now an error.
-Previously, '\x' without at least one hex digit denoted character code
-zero (NUL) but as this was neither intended nor documented or even
-known by anyone, it is now treated as an error by the Lisp reader.
-
----
-** Connection-local variables are applied in buffers visiting a remote file.
+** Connection-local variables are applied in buffers visiting remote files.
This overrides possible directory-local or file-local variables with
the same name.
----
-** User option 'tramp-completion-reread-directory-timeout' has been removed.
-This user option has been obsoleted in Emacs 27, use
-'remote-file-name-inhibit-cache' instead.
-
----
-** User options 'eshell-NAME-unload-hook' are now obsolete.
-These hooks were named incorrectly, and so they never actually ran
-when unloading the corresponding feature. Instead, you should use
-hooks named after the feature name, like 'esh-mode-unload-hook'.
-
+++
** 'copy-tree' now copies records when its optional 2nd argument is non-nil.
@@ -2195,58 +2235,14 @@ assertion only (which is useless). For historical compatibility, an
operator character following '^' or '\`' becomes literal, but we
advise against relying on this.
----
-** Mode-line mnemonics for some coding-systems have changed.
-The mode-line mnemonic for 'utf-7' is now the lowercase 'u', to be
-consistent with the other encodings of this family.
-
-The mode-line mnemonic for 'koi8-u' is now 'У', U+0423 CYRILLIC
-CAPITAL LETTER U, to distinguish between this encoding and the
-UTF-8/UTF-16 family.
-
-If your terminal cannot display 'У', or if you want to get the old
-behavior back for any other reason, you can do that using the
-'coding-system-put' function. For example, the following restores the
-previous behavior of showing 'U' in the mode line for 'koi8-u':
-
- (coding-system-put 'koi8-u :mnemonic ?U)
-
----
-** 'vietnamese-tcvn' is now a coding system alias for 'vietnamese-vscii'.
-VSCII-1 and TCVN-5712 are different names for the same character
-encoding. Therefore, the duplicate coding system definition has been
-dropped in favor of an alias.
-
-The mode-line mnemonic for 'vietnamese-vscii' and its aliases is the
-lowercase letter 'v'.
-
+++
** Infinities and NaNs no longer act as symbols on non-IEEE platforms.
On old platforms like the VAX that do not support IEEE floating-point,
-tokens like 0.0e+NaN and 1.0e+INF are no longer read as symbols.
+tokens like '0.0e+NaN' and '1.0e+INF' are no longer read as symbols.
Instead, the Lisp reader approximates an infinity with the nearest
finite value, and a NaN with some other non-numeric object that
provokes an error if used numerically.
-+++
-** X color support compatibility aliases are now marked obsolete.
-The compatibility aliases 'x-defined-colors', 'x-color-defined-p',
-'x-color-values', and 'x-display-color-p' are now obsolete.
-
-+++
-** 'easy-mmode-define-{minor,global}-mode' aliases are now obsolete.
-Use 'define-minor-mode' and 'define-globalized-minor-mode' instead.
-
-** The obsolete calling convention of 'sit-for' has been removed.
-That convention was: '(sit-for SECONDS MILLISEC &optional NODISP)'.
-
-** The 'millisec' argument of 'sleep-for' has been declared obsolete.
-Use a float value for the first argument instead.
-
-** 'eshell-process-wait-{seconds,milliseconds}' options are now obsolete.
-Instead, use 'eshell-process-wait-time', which supports floating-point
-values.
-
+++
** Conversion of strings to and from byte-arrays works with multibyte strings.
The functions 'dbus-string-to-byte-array' and
@@ -2269,13 +2265,80 @@ When it has a non-nil value, then completion functions like
'completing-read' don't discard text properties from the returned
completion candidate.
++++
+** X color support compatibility aliases are now obsolete.
+The compatibility aliases 'x-defined-colors', 'x-color-defined-p',
+'x-color-values', and 'x-display-color-p' are now obsolete.
+
++++
+** 'easy-mmode-define-{minor,global}-mode' aliases are now obsolete.
+Use 'define-minor-mode' and 'define-globalized-minor-mode' instead.
+
++++
+** The 'millisec' argument of 'sleep-for' is now obsolete.
+Use a float value for the first argument instead.
+
+---
+** User options 'eshell-NAME-unload-hook' are now obsolete.
+These hooks were named incorrectly, and so they never actually ran
+when unloading the corresponding feature. Instead, you should use
+hooks named after the feature name, like 'esh-mode-unload-hook'.
+
+** User options 'eshell-process-wait-{seconds,milliseconds}' are now obsolete.
+Instead, use 'eshell-process-wait-time', which supports floating-point
+values.
+
+---
+** User option 'tramp-completion-reread-directory-timeout' has been removed.
+This user option has been obsoleted in Emacs 27, use
+'remote-file-name-inhibit-cache' instead.
+
++++
+** The obsolete calling convention of 'sit-for' has been removed.
+That convention was: '(sit-for SECONDS MILLISEC &optional NODISP)'.
+
+---
+** 'defadvice' is marked as obsolete.
+See the "(elisp) Porting Old Advice" Info node for help converting
+them to use 'advice-add' or 'define-advice' instead.
+
+---
+** 'cl-old-struct-compat-mode' is marked as obsolete.
+You may need to recompile your code if it was compiled with Emacs < 24.3.
+
+---
+** Old derived.el functions removed.
+The following functions have been deleted because they were only used
+by code compiled with Emacs < 21:
+'derived-mode-init-mode-variables', 'derived-mode-merge-abbrev-tables',
+'derived-mode-merge-keymaps', 'derived-mode-merge-syntax-tables',
+'derived-mode-run-hooks', 'derived-mode-set-abbrev-table',
+'derived-mode-set-keymap', 'derived-mode-set-syntax-table',
+'derived-mode-setup-function-name'.
+
* Lisp Changes in Emacs 30.1
++++
+** The 'wheel-up/down/left/right' events are now bound unconditionally.
+The 'mouse-wheel-up/down/left/right-event' variables are thus used only
+to specify the 'mouse-4/5/6/7' events that might still happen to be
+generated by some old packages (or if 'mouse-wheel-buttons' has been set
+to nil).
+
+---
+** Xterm Mouse mode now emits 'wheel-up/down/right/left' events.
+This is instead of 'mouse-4/5/6/7' events for the mouse wheel. It uses
+the new variable 'mouse-wheel-buttons' to decide which button maps to
+which wheel event (if any).
+
+---
+** In batch mode, tracing now sends the trace to stdout.
+
+++
** New hook 'hack-dir-local-get-variables-functions'.
This can be used to provide support for other directory-local settings
-beside '.dir-locals.el'.
+beside ".dir-locals.el".
+++
** 'auto-coding-functions' can know the name of the file.
@@ -2284,11 +2347,12 @@ which the text belongs by consulting the variable 'auto-coding-file-name'.
+++
** New user option 'compilation-safety' to control safety of native code.
-It's now possible to control how safe is the code generated by native
+It is now possible to control how safe is the code generated by native
compilation, by customizing this user option. It is also possible to
control this at function granularity by using the new 'safety' parameter
in the function's 'declare' form.
++++
** New types 'closure' and 'interpreted-function'.
'interpreted-function' is the new type used for interpreted functions,
and 'closure' is the common parent type of 'interpreted-function'
@@ -2298,6 +2362,7 @@ Those new types come with the associated new predicates 'closurep' and
'interpreted-function-p' as well as a new constructor
'make-interpreted-closure'.
+---
** New function 'help-fns-function-name'.
For named functions, it just returns the name and otherwise
it returns a short "unique" string that identifies the function.
@@ -2309,22 +2374,26 @@ further details.
This is a convenience function to return the Unicode name of a char (if
it has one).
++++
** New function 'cl-type-of'.
This function is like 'type-of' except that it sometimes returns
a more precise type. For example, for nil and t it returns 'null'
and 'boolean' respectively, instead of just 'symbol'.
++++
** New functions 'primitive-function-p' and 'cl-functionp'.
'primitive-function-p' is like 'subr-primitive-p' except that it returns
t only if the argument is a function rather than a special-form,
and 'cl-functionp' is like 'functionp' except it returns nil
for lists and symbols.
-** Built-in types have now corresponding classes.
+---
+** Built-in types now have corresponding classes.
At the Lisp level, this means that things like '(cl-find-class 'integer)'
will now return a class object, and at the UI level it means that
things like 'C-h o integer RET' will show some information about that type.
+---
** New variable 'major-mode-remap-defaults' and function 'major-mode-remap'.
The first is like Emacs-29's 'major-mode-remap-alist' but to be set by
packages (instead of users). The second looks up those two variables.
@@ -2358,17 +2427,18 @@ the backtrace and other dynamic state at the point of the error. See
the Info node "(elisp) Handling Errors".
+++
-** Tooltips on fringes.
+** New text properties add tooltips on fringes.
It is now possible to provide tooltips on fringes by adding special text
properties 'left-fringe-help' and 'right-fringe-help'. See the "(elisp)
Special Properties" Info node in the Emacs Lisp Reference Manual for
more details.
+++
-** New 'pop-up-frames' action alist entry for 'display-buffer'.
+** New 'display-buffer' action alist entry 'pop-up-frames'.
This has the same effect as the variable of the same name and takes
precedence over the variable when present.
+---
** New function 'merge-ordered-lists'.
Mostly used internally to do a kind of topological sort of
inheritance hierarchies.
@@ -2413,11 +2483,13 @@ its input in-place as before.
** New API for 'derived-mode-p' and control of the graph of major modes.
++++
*** 'derived-mode-p' now takes the list of modes as a single argument.
The same holds for 'provided-mode-derived-p'.
The old calling convention where multiple modes are passed as
separate arguments is deprecated.
++++
*** New functions to access the graph of major modes.
While 'define-derived-mode' still only supports single inheritance,
modes can declare additional parents (for tests like 'derived-mode-p')
@@ -2433,34 +2505,34 @@ drops incorporating more than one URL. Functions capable of this must
set their 'dnd-multiple-handler' symbol properties to a non-nil value.
See the Info node "(elisp) Drag and Drop".
-Incident to this change, the function 'dnd-handle-one-url' has been
-made obsolete, for it cannot take these new handlers into account.
+The function 'dnd-handle-one-url' has been made obsolete, since it
+cannot take these new handlers into account.
++++
+** 'notifications-notify' can use Icon Naming Specification for ':app-icon'.
+You can use a symbol as the value for ':app-icon' to provide icon name
+without specifying a file, like this:
+
+ (notifications-notify
+ :title "I am playing music" :app-icon 'multimedia-player)
+
+---
** New function 're-disassemble' to see the innards of a regexp.
-If you compiled with '--enable-checking', you can use this to help debug
-either your regexp performance problems or the regexp engine.
+If you built Emacs with '--enable-checking', you can use this to help
+debug either your regexp performance problems or the regexp engine.
+++
** XLFDs are no longer restricted to 255 characters.
'font-xlfd-name' now returns an XLFD even if it is greater than 255
characters in length, provided that the LONG_XLFDs argument is true.
-
Other features in Emacs which employ XLFDs have been modified to
produce and understand XLFDs larger than 255 characters.
-** 'defadvice' is marked as obsolete.
-See the "(elisp) Porting Old Advice" Info node for help converting
-them to use 'advice-add' or 'define-advice' instead.
-
-** 'cl-old-struct-compat-mode' is marked as obsolete.
-You may need to recompile our code if it was compiled with Emacs < 24.3.
-
+++
** New macro 'static-if' for conditional evaluation of code.
This macro hides a form from the evaluator or byte-compiler based on a
compile-time condition. This is handy for avoiding byte-compilation
-warnings about code that will never actually run under some
-conditions.
+warnings about code that will never actually run under some conditions.
+++
** Desktop notifications are now supported on the Haiku operating system.
@@ -2468,10 +2540,10 @@ The new function 'haiku-notifications-notify' provides a subset of the
capabilities of the 'notifications-notify' function in a manner
analogous to 'w32-notification-notify'.
-** New variable 'haiku-pass-control-tab-to-system'.
+** New Haiku specific variable 'haiku-pass-control-tab-to-system'.
This sets whether Emacs should pass 'C-TAB' on to the system instead of
handling it, fixing a problem where window switching would not activate
-if an Emacs frame had focus on the Haiku operation system.
+if an Emacs frame had focus on the Haiku operating system.
+++
** New value 'if-regular' for the REPLACE argument to 'insert-file-contents'.
@@ -2495,8 +2567,7 @@ The new variables 'ctags-program-name', 'ebrowse-program-name',
'etags-program-name', 'hexl-program-name', 'emacsclient-program-name'
'movemail-program-name', and 'rcs2log-program-name' should be used
instead of "ctags", "ebrowse", "etags", "hexl", "emacsclient", and
-"rcs2log", when starting one of these built in programs in a
-subprocess.
+"rcs2log", when starting one of these built in programs in a subprocess.
+++
** New variable 'case-symbols-as-words' affects case operations for symbols.
@@ -2506,100 +2577,24 @@ as a single word. This is useful for programming languages and styles
where only the first letter of a symbol's name is ever capitalized.
The default value of this variable is nil.
-+++
-** 'x-popup-menu' now understands touch screen events.
-When a 'touchscreen-begin' or 'touchscreen-end' event is passed as the
-POSITION argument, it will behave as if that event was a mouse event.
+---
+** Bytecode is now always loaded eagerly.
+Bytecode compiled with older Emacs versions for lazy loading using
+'byte-compile-dynamic' is now loaded all at once.
+As a consequence, 'fetch-bytecode' has no use, does nothing, and is
+now obsolete. The variable 'byte-compile-dynamic' has no effect any
+more; compilation will always yield bytecode for eager loading.
+++
-** New functions for handling touch screen events.
-The new functions 'touch-screen-track-tap' and
-'touch-screen-track-drag' handle tracking common touch screen gestures
-from within a command.
-
-** New user option 'safe-local-variable-directories'.
-This user option names directories in which Emacs will treat all
-directory-local variables as safe.
-
-+++
-** New parameter to 'touchscreen-end' events.
-CANCEL non-nil establishes that the touch sequence has been
-intercepted by programs such as window managers and should be ignored
-with Emacs.
-
-** New variable 'inhibit-auto-fill' to temporarily prevent auto-fill.
-
-+++
-** New variable 'secondary-tool-bar-map'.
-If non-nil, this variable contains a keymap of menu items that are
-displayed along tool bar items inside 'tool-bar-map'.
-
-** New variable 'completion-lazy-hilit'.
-Lisp programs that present completion candidates may bind this
-variable non-nil around calls to functions such as
-'completion-all-completions'. This tells the underlying completion
-styles to skip eager fontification of completion candidates, which
-improves performance. Such a Lisp program can then use the
-'completion-lazy-hilit' function to fontify candidates just in time.
-
-** New primitive 'buffer-last-name'.
-It returns the name of a buffer before the last time it was renamed or
-killed.
-
-** New primitive 'marker-last-position'.
-It returns the last position of a marker in its buffer even if that
-buffer has been killed. ('marker-position' would return nil in that
-case.)
-
-** Functions and variables to transpose sexps
-
-+++
-*** New helper variable 'transpose-sexps-function'.
-Emacs now can set this variable to customize the behavior of the
-'transpose-sexps' function.
-
-+++
-*** New function 'transpose-sexps-default-function'.
-The previous implementation is moved into its own function, to be
-bound by 'transpose-sexps-function'.
-
-*** New function 'treesit-transpose-sexps'.
-Tree-sitter now unconditionally sets 'transpose-sexps-function' for all
-tree-sitter enabled modes. This functionality utilizes the new
-'transpose-sexps-function'.
-
-** Functions and variables to move by program statements
-
-*** New variable 'forward-sentence-function'.
-Major modes can now set this variable to customize the behavior of the
-'forward-sentence' command.
-
-*** New function 'forward-sentence-default-function'.
-The previous implementation of 'forward-sentence' is moved into its
-own function, to be bound by 'forward-sentence-function'.
-
-*** New function 'treesit-forward-sentence'.
-All tree-sitter enabled modes that define 'sentence' in
-'treesit-thing-settings' now set 'forward-sentence-function' to call
-'treesit-forward-sentence'.
-
-** Functions and variables to move by program sexps
-
-*** New function 'treesit-forward-sexp'.
-Tree-sitter conditionally sets 'forward-sexp-function' for major modes
-that have defined 'sexp' in 'treesit-thing-settings' to enable
-sexp-related motion commands.
-
-+++
-** Returned strings are never docstrings.
+** Returned strings from functions and macros are never docstrings.
Functions and macros whose bodies consist of a single string literal now
-only return that string; it is not used as a docstring. Example:
+only return that string, and will not use it as a docstring. Example:
(defun sing-a-song ()
"Sing a song.")
-The above function returns the string '"Sing a song."' but has no
-docstring. Previously, that string was used as both a docstring and
+The above function returns the string "Sing a song." and has no
+docstring. Previously, that string was used as both the docstring and
return value, which was never what the programmer wanted. If you want
the string to be a docstring, add an explicit return value.
@@ -2715,8 +2710,8 @@ default (unconditional) clause. Example:
(t (say "some"))
(say "goodbye"))
-Such a clause will never be executed but is likely to be a mistake,
-perhaps due to misplaced brackets.
+Such a clause will never be executed, and is likely to be a mistake,
+perhaps due to misplaced parens.
This warning can be suppressed using 'with-suppressed-warnings' with
the warning name 'suspicious'.
@@ -2730,9 +2725,9 @@ some obvious cases. Examples:
(aset [3 4] 0 8)
(aset "abc" 1 ?d)
-Such code may have unpredictable behavior because the constants are
-part of the program, not data structures generated afresh during
-execution, and the compiler does not expect them to change.
+Such code may have unpredictable behavior because the constants are part
+of the program and are not data structures generated afresh during
+execution; the compiler does not expect them to change.
To avoid the warning, operate on an object created by the program
(maybe a copy of the constant), or use a non-destructive operation
@@ -2778,6 +2773,112 @@ The warning name is 'docstrings-control-chars'.
*** The warning about wide docstrings can now be disabled separately.
Its warning name is 'docstrings-wide'.
++++
+** 'fset', 'defalias' and 'defvaralias' now signal an error for cyclic aliases.
+Previously, 'fset', 'defalias' and 'defvaralias' could be made to
+build circular function and variable indirection chains as in
+
+ (defalias 'able 'baker)
+ (defalias 'baker 'able)
+
+but trying to use them would sometimes make Emacs hang. Now, an attempt
+to create such a loop results in an error.
+
+Since circular alias chains now cannot occur, 'function-alias-p',
+'indirect-function' and 'indirect-variable' will never signal an error.
+Their 'noerror' arguments have no effect and are therefore obsolete.
+
+** Touch Screen support
+
++++
+*** 'x-popup-menu' now understands touch screen events.
+When a 'touchscreen-begin' or 'touchscreen-end' event is passed as the
+POSITION argument, it will behave as if that event was a mouse event.
+
++++
+*** New functions for handling touch screen events.
+The new functions 'touch-screen-track-tap' and 'touch-screen-track-drag'
+handle tracking common touch screen gestures from within a command.
+
++++
+*** New parameter to 'touchscreen-end' events.
+CANCEL non-nil establishes that the touch sequence has been intercepted
+by programs such as window managers and should be ignored with Emacs.
+
+---
+** New variable 'inhibit-auto-fill' to temporarily prevent auto-fill.
+
++++
+** New variable 'secondary-tool-bar-map'.
+If non-nil, this variable contains a keymap of menu items that are
+displayed along tool bar items defined by 'tool-bar-map'. These items
+are displayed below the tool bar if the value of 'tool-bar-position' is
+'top', and above it if the value is 'bottom'. This is used by
+'modifier-bar-mode'.
+
+---
+** New variable 'completion-lazy-hilit'.
+Lisp programs that present completion candidates may bind this
+variable non-nil around calls to functions such as
+'completion-all-completions'. This tells the underlying completion
+styles to skip eager fontification of completion candidates, which
+improves performance. Such a Lisp program can then use the
+'completion-lazy-hilit' function to fontify candidates just in time.
+
++++
+** New primitive 'buffer-last-name'.
+It returns the name of a buffer before the last time it was renamed or
+killed.
+
++++
+** New primitive 'marker-last-position'.
+It returns the last position of a marker in its buffer even if that
+buffer has been killed. ('marker-position' would return nil in that
+case.)
+
+** Functions and variables to transpose sexps
+
+---
+*** New helper variable 'transpose-sexps-function'.
+Lisp programs can now set this variable to customize the behavior of the
+'transpose-sexps' command.
+
+---
+*** New function 'transpose-sexps-default-function'.
+The previous implementation of 'transpose-sexps' was moved into its own
+function, to be used in 'transpose-sexps-function'.
+
+---
+*** New function 'treesit-transpose-sexps'.
+Tree-sitter now unconditionally sets 'transpose-sexps-function' for all
+tree-sitter enabled modes to this function.
+
+** Functions and variables to move by program statements
+
++++
+*** New variable 'forward-sentence-function'.
+Major modes can now set this variable to customize the behavior of the
+'forward-sentence' command.
+
+---
+*** New function 'forward-sentence-default-function'.
+The previous implementation of 'forward-sentence' is moved into its
+own function, to be bound by 'forward-sentence-function'.
+
++++
+*** New function 'treesit-forward-sentence'.
+All tree-sitter enabled modes that define 'sentence' in
+'treesit-thing-settings' now set 'forward-sentence-function' to call
+'treesit-forward-sentence'.
+
+** Functions and variables to move by program sexps
+
++++
+*** New function 'treesit-forward-sexp'.
+Tree-sitter conditionally sets 'forward-sexp-function' for major modes
+that have defined 'sexp' in 'treesit-thing-settings' to enable
+sexp-related motion commands.
+
---
** New user option 'native-comp-async-warnings-errors-kind'.
It allows control of what kinds of warnings and errors from asynchronous
@@ -2811,34 +2912,12 @@ The declaration '(important-return-value t)' sets the
'important-return-value' property which indicates that the function
return value should probably not be thrown away implicitly.
-** Bytecode is now always loaded eagerly.
-Bytecode compiled with older Emacs versions for lazy loading using
-'byte-compile-dynamic' is now loaded all at once.
-As a consequence, 'fetch-bytecode' has no use, does nothing, and is
-now obsolete. The variable 'byte-compile-dynamic' has no effect any
-more; compilation will always yield bytecode for eager loading.
-
+++
** New functions 'file-user-uid' and 'file-group-gid'.
These functions are like 'user-uid' and 'group-gid', respectively, but
are aware of file name handlers, so they will return the remote UID or
GID for remote files (or -1 if the connection has no associated user).
-+++
-** 'fset', 'defalias' and 'defvaralias' now signal an error for cyclic aliases.
-Previously, 'fset', 'defalias' and 'defvaralias' could be made to
-build circular function and variable indirection chains as in
-
- (defalias 'able 'baker)
- (defalias 'baker 'able)
-
-but trying to use them would sometimes make Emacs hang. Now, an attempt
-to create such a loop results in an error.
-
-Since circular alias chains now cannot occur, 'function-alias-p',
-'indirect-function' and 'indirect-variable' will never signal an error.
-Their 'noerror' arguments have no effect and are therefore obsolete.
-
+++
** 'treesit-font-lock-rules' now accepts additional global keywords.
When supplied with ':default-language LANGUAGE', rules after it will
@@ -2936,7 +3015,7 @@ aforementioned functions:
** 'vtable-update-object' updates an existing object with just two arguments.
It is now possible to update the representation of an object in a vtable
by calling 'vtable-update-object' with just the vtable and the object as
-arguments. (Previously the 'old-object' argument was required which, in
+arguments. (Previously, the OLD-OBJECT argument was required which, in
this case, would mean repeating the object in the argument list.) When
replacing an object with a different one, passing both the new and old
objects is still necessary.
@@ -2953,6 +3032,12 @@ this was not possible.) In addition, LOCATION can be an integer, a
(zero-based) index into the table at which the new object is inserted
(BEFORE is ignored in this case).
++++
+** New function 'sqlite-execute-batch'.
+This function lets the user execute multiple SQL statements in one go.
+It is useful, for example, when a Lisp program needs to evaluate an
+entire SQL file.
+
** JSON
---
@@ -3015,7 +3100,7 @@ functionalities to operate correctly.
** MS-Windows
+++
-*** You can now opt out of following the system's Dark mode.
+*** You can now opt out of following MS-Windows' Dark mode.
By default, Emacs on MS-Windows follows the system's Dark mode for its
title bars' and scroll bars' appearance. If the new user option
'w32-follow-system-dark-mode' is customized to the nil value, Emacs
@@ -3023,9 +3108,9 @@ will disregard the system's Dark mode and will always use the default
Light mode.
---
-*** You can now use Image-Dired even if 'convert' command is not installed.
+*** You can now use Image-Dired even if the 'convert' program is not installed.
If you don't have GraphicsMagick or ImageMagick installed, and thus the
-'gm convert'/'convert' command is not available, Emacs on MS-Windows
+'gm convert'/'convert' program is not available, Emacs on MS-Windows
will now use its own function 'w32image-create-thumbnail' to create
thumbnail images and show them in the thumbnail buffer. Unlike with
using 'convert', this fallback method is synchronous, so Emacs will wait
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index edeb7d3ab6c..bbf26d9515d 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -18,6 +18,9 @@ Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
# Here, we list the *most important* changes and changes that _likely_
# require user action for most Org mode users.
# Sorted from most important to least important.
+*** Arbitrary shell commands may no longer run when turning on Org mode
+
+This is for security reasons, to avoid running malicious commands.
*** =python-mode.el (MELPA)= support in =ob-python.el= is removed
@@ -177,7 +180,7 @@ Previously, when exporting to Org, all the citations and
=print_bibliography= keywords, were transformed according to the
chosen citation processor.
-This is no loner the case. All the citation-related markup is now
+This is no longer the case. All the citation-related markup is now
exported as is.
The previous behavior can be reverted by setting new custom option
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index abc675ccf48..eb7239a482a 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2135,14 +2135,6 @@ with a different toolkit. For example:
This produces a build which uses Athena toolkit, and disables toolkit
scroll bars which could sometimes be slow.
-* Runtime problems specific to PGTK build
-
-** SECONDARY selections don't work on Wayland.
-
-This is because the SECONDARY selection is not implemented by the
-Wayland compositor being used. A workaround is to use other kinds of
-selections.
-
* Runtime problems on character terminals
** The meta key does not work on xterm.
@@ -3478,7 +3470,13 @@ file; for example:
"/usr/local/opt/libgccjit/lib/gcc/11"
"/usr/local/opt/gcc/lib/gcc/11/gcc/x86_64-apple-darwin20/11.2.0") ":"))
-* Runtime problems specific to PGTK
+* Runtime problems specific to PGTK build
+
+** SECONDARY selections don't work on Wayland.
+
+This is because the SECONDARY selection is not implemented by the
+Wayland compositor being used. A workaround is to use other kinds of
+selections.
** Giant tool bar icons are displayed in some cases
diff --git a/etc/TODO b/etc/TODO
index 2750e3c114d..590cd350e0e 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -88,6 +88,15 @@ outside of the mode they were written for.
Verify the conversion by comparing the value of the keymap before
converting it and after (you can see the value in 'C-h v').
+** Change documentation examples to use 'setopt' instead of 'setq'
+User options are variables defined with 'defcustom', as opposed to
+'defvar' or 'defconst'. It is preferable to use 'setopt' to set user
+options instead of 'setq', since it will execute any ‘custom-set’ form
+associated with that variable. Pick a package and make sure that it
+uses 'setopt' in any examples in its documentation (doc strings, manual,
+Commentary section, etc.). Note that 'setopt' is new in Emacs 29.1, so
+packages that need support for earlier versions should still use 'setq'.
+
** Write more tests
Pick a fixed bug from the database, write a test case to make sure it
stays fixed. Or pick your favorite programming major-mode, and write
@@ -718,10 +727,17 @@ bar. In the mean time, it should process other messages.
** Get some major packages installed
+*** Magit
+This needs work on getting the relevant copyright assignments. This
+task should be highly doable for anyone, but will likely require some
+patience. For inspiration, see how this was done for 'use-package':
+https://github.com/jwiegley/use-package/issues/282
+
*** PSGML, _possibly_ ECB
https://lists.gnu.org/r/emacs-devel/2007-05/msg01493.html Check the
assignments file for other packages which might go in and have been
-missed.
+missed. (Not sure if this is still relevant in 2024. For example, both
+packages seem to be unmaintained.)
** Make byte-compiler warnings smarter
Byte-compiler warnings about functions that might be undefined at run
@@ -910,6 +926,12 @@ restore the redirection through funcall.
*** Features to be improved or missing
+**** Make use of function type declaration
+
+The native compiler should make use of function type declarations (when
+available) to propagate parameter types inside the function for better
+value/type predictions.
+
**** Fix portable dumping so that you can redump without using -batch
***** Redumps and native compiler "preloaded" sub-folder.
@@ -944,25 +966,6 @@ the tool bar is performed.
Unfortunately, the tool bar (and possible other operations) always
resize the frame.
-**** Support 'proced' (implement 'process-attributes')
-Unfortunately, a user-level process like Emacs does not have the
-privileges to get information about other processes under macOS.
-
-There are other ways to do this:
-
- 1) Spawn "ps" and parse the output ("ps" has superuser privileges).
-
- 2) Sign Emacs as part of the distribution process.
-
- 3) Ask the user to self-sign Emacs, if this feature is of interest.
-
-Anders Lindgren has implemented
-'process-attributes' for macOS, which currently only work when
-running Emacs as root.
-
-See this article by Bozhidar Batsov for an overview of Proced:
-https://emacsredux.com/blog/2013/05/02/manage-processes-with-proced/
-
**** Tooltip properties
Tooltip properties like the background color and font are hard-wired,
even though Emacs allows a user to customize such features.
@@ -1104,10 +1107,6 @@ corner and track mouse movements, but this did not work well, and was
not scalable to the new Lion "resize on every window edge" behavior.
[As of trunk r109635, 2012-08-15, the event loop no longer polls.]
-**** mouse-avoidance-mode
-(mouse-avoidance-mode 'banish) then minimize Emacs, will pop window back
-up on top of all others (probably fixed in bug#17439).
-
**** free_frame_resources, face colors
**** Numeric keysetting bug.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 3967459fd81..1860e269706 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
% Reference Card for Org Mode
-\def\orgversionnumber{9.7.4}
+\def\orgversionnumber{9.7.5}
\def\versionyear{2024} % latest update
\input emacsver.tex
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index 7ee0c8cc71e..08bd56ede70 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -848,7 +848,7 @@ more..."
`(org-example ((,class (:foreground "blue" :background "#EEFFEE"))))
`(org-footnote ((,class (:underline t :foreground "#008ED1"))))
`(org-formula ((,class (:foreground "chocolate1"))))
- ;; org-habit colours are thanks to zenburn
+ ;; org-habit colors are thanks to zenburn
`(org-habit-ready-face ((t :background "#7F9F7F"))) ; ,zenburn-green
`(org-habit-alert-face ((t :background "#E0CF9F" :foreground "#3F3F3F"))) ; ,zenburn-yellow-1 fg ,zenburn-bg
`(org-habit-clear-face ((t :background "#5C888B"))) ; ,zenburn-blue-3
diff --git a/exec/Makefile.in b/exec/Makefile.in
index 36f0c0c74a9..7e681c0c3d8 100644
--- a/exec/Makefile.in
+++ b/exec/Makefile.in
@@ -44,6 +44,9 @@ FIND_DELETE = @FIND_DELETE@
OBJS = @OBJS@
LOADOBJS = $(patsubst %.s,%.o,$(LOADER))
+# Compilation parameters.
+ is_mips = @is_mips@
+
# Set up automatic dependency tracking.
AUTO_DEPEND = @AUTO_DEPEND@
@@ -82,6 +85,8 @@ Makefile: config.status Makefile.in
.SUFFIXES: .c .s
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEPFLAGS) -I. -I$(srcdir) $< -o $@
+
+ifeq ($(is_mips),yes)
.s.o:
$(M4) $< > $(notdir $<).s
$(AS) $(ASFLAGS) $(notdir $<).s -o $@
@@ -91,6 +96,10 @@ Makefile: config.status Makefile.in
config-mips.m4: config-mips.m4.in
cd $(srcdir) && ./config.status $@
$(LOADOBJS): config-mips.m4
+else
+.s.o:
+ $(AS) $(ASFLAGS) $< -o $@
+endif
# Set up rules to build libexec.a.
diff --git a/exec/README b/exec/README
index f7eb21cfc84..a1534503247 100644
--- a/exec/README
+++ b/exec/README
@@ -1,3 +1,6 @@
This directory holds the source code to a library used to replace the
`execve' and `execveat' system calls, used by the Android port of
Emacs to start executables without intervention from the system.
+
+The most edifying resource for developers will be GDB, or to be precise,
+the Linux target implementations for architectures of interest.
diff --git a/exec/configure.ac b/exec/configure.ac
index a473a1dc633..c3e895740be 100644
--- a/exec/configure.ac
+++ b/exec/configure.ac
@@ -42,11 +42,6 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see . */])
-AC_ARG_WITH([reentrancy],
- [AS_HELP_STRING([--with-reentrancy],
- [Generate library which can be used within a signal handler.])],
- [AC_DEFINE([REENTRANT], [1])])
-
AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CC
AC_PROG_CPP
@@ -74,9 +69,9 @@ AC_CHECK_FUNC([process_vm_readv],
]])])])
AC_CHECK_HEADERS([sys/param.h sys/uio.h])
AC_CHECK_MEMBERS([siginfo_t.si_syscall], [], [],
- [[
+[[
#include
- ]])
+]])
AH_BOTTOM([
#ifdef HAVE_STDBOOL_H
@@ -120,6 +115,7 @@ AH_TEMPLATE([SYSCALL_ARG2_REG], [Define to register holding arg2 to system calls
AH_TEMPLATE([SYSCALL_ARG3_REG], [Define to register holding arg3 to system calls.])
AH_TEMPLATE([SYSCALL_RET_REG], [Define to register holding value of system calls.])
AH_TEMPLATE([STACK_POINTER], [Define to register holding the stack pointer.])
+AH_TEMPLATE([PROGRAM_COUNTER], [Define to register holding the program counter.])
AH_TEMPLATE([EXEC_SYSCALL], [Define to number of the `exec' system call.])
AH_TEMPLATE([USER_WORD], [Define to word type used by tracees.])
AH_TEMPLATE([USER_SWORD], [Define to signed word type used by tracees.])
@@ -134,7 +130,8 @@ AH_TEMPLATE([READLINK_SYSCALL], [Define to number of the `readlink' system call.
AH_TEMPLATE([READLINKAT_SYSCALL], [Define to number of the `readlinkat' system call.])
AH_TEMPLATE([OPEN_SYSCALL], [Define to number of the `open' system call.])
AH_TEMPLATE([OPENAT_SYSCALL], [Define to number of the `openat' system call.])
-AH_TEMPLATE([REENTRANT], [Define to 1 if the library is used within a signal handler.])
+AH_TEMPLATE([HAVE_SECCOMP], [Define to 1 if secure computing filters are available
+to accelerate interception of system calls.])
AC_CANONICAL_HOST
@@ -250,6 +247,7 @@ AS_CASE([$host], [x86_64-*linux*],
AC_DEFINE([SYSCALL_ARG2_REG], [rdx])
AC_DEFINE([SYSCALL_ARG3_REG], [r10])
AC_DEFINE([STACK_POINTER], [rsp])
+ AC_DEFINE([PROGRAM_COUNTER], [rip])
AC_DEFINE([EXEC_SYSCALL], [__NR_execve])
AC_DEFINE([USER_WORD], [uintptr_t])
AC_DEFINE([USER_SWORD], [intptr_t])
@@ -283,6 +281,7 @@ AS_CASE([$host], [x86_64-*linux*],
AC_DEFINE([SYSCALL_ARG2_REG], [edx])
AC_DEFINE([SYSCALL_ARG3_REG], [esi])
AC_DEFINE([STACK_POINTER], [esp])
+ AC_DEFINE([PROGRAM_COUNTER], [eip])
AC_DEFINE([EXEC_SYSCALL], [__NR_execve])
AC_DEFINE([USER_WORD], [uintptr_t])
AC_DEFINE([USER_SWORD], [intptr_t])
@@ -314,6 +313,7 @@ AS_CASE([$host], [x86_64-*linux*],
AC_DEFINE([SYSCALL_ARG2_REG], [[regs[2]]])
AC_DEFINE([SYSCALL_ARG3_REG], [[regs[3]]])
AC_DEFINE([STACK_POINTER], [sp])
+ AC_DEFINE([PROGRAM_COUNTER], [pc])
AC_DEFINE([EXEC_SYSCALL], [__NR_execve])
AC_DEFINE([USER_WORD], [uintptr_t])
AC_DEFINE([USER_SWORD], [intptr_t])
@@ -346,6 +346,7 @@ AS_CASE([$host], [x86_64-*linux*],
AC_DEFINE([SYSCALL_ARG2_REG], [[uregs[2]]])
AC_DEFINE([SYSCALL_ARG3_REG], [[uregs[3]]])
AC_DEFINE([STACK_POINTER], [[uregs[13]]])
+ AC_DEFINE([PROGRAM_COUNTER], [[uregs[15]]])
AC_DEFINE([EXEC_SYSCALL], [__NR_execve])
AC_DEFINE([USER_WORD], [uintptr_t])
AC_DEFINE([USER_SWORD], [intptr_t])
@@ -371,6 +372,7 @@ AS_CASE([$host], [x86_64-*linux*],
AC_DEFINE([SYSCALL_ARG2_REG], [[uregs[2]]])
AC_DEFINE([SYSCALL_ARG3_REG], [[uregs[3]]])
AC_DEFINE([STACK_POINTER], [[uregs[13]]])
+ AC_DEFINE([STACK_POINTER], [[uregs[15]]])
AC_DEFINE([EXEC_SYSCALL], [__NR_execve])
AC_DEFINE([USER_WORD], [uintptr_t])
AC_DEFINE([USER_SWORD], [intptr_t])
@@ -402,6 +404,7 @@ AS_CASE([$host], [x86_64-*linux*],
AC_DEFINE([SYSCALL_ARG2_REG], [[gregs[4]]]) # a2
AC_DEFINE([SYSCALL_ARG3_REG], [[gregs[5]]]) # a3
AC_DEFINE([STACK_POINTER], [[gregs[29]]]) # sp
+ AC_DEFINE([PROGRAM_COUNTER], [[cp0_epc]]) # pc
AC_DEFINE([EXEC_SYSCALL], [__NR_execve])
AC_DEFINE([USER_WORD], [uintptr_t])
AC_DEFINE([USER_SWORD], [intptr_t])
@@ -432,6 +435,7 @@ AS_CASE([$host], [x86_64-*linux*],
AC_DEFINE([SYSCALL_ARG2_REG], [[gregs[4]]]) # a2
AC_DEFINE([SYSCALL_ARG3_REG], [[gregs[5]]]) # a3
AC_DEFINE([STACK_POINTER], [[gregs[29]]]) # sp
+ AC_DEFINE([PROGRAM_COUNTER], [[cp0_epc]]) # pc
AC_DEFINE([EXEC_SYSCALL], [__NR_execve])
AC_DEFINE([USER_WORD], [uintptr_t])
AC_DEFINE([USER_SWORD], [intptr_t])
@@ -480,6 +484,12 @@ AC_ARG_VAR([LOADERFLAGS], [Flags used to link the loader.])
AC_ARG_VAR([ARFLAGS], [Flags for the archiver.])
AC_ARG_VAR([ASFLAGS], [Flags for the assembler.])
+# Search for seccomp headers and declarations.
+AC_CHECK_HEADERS([linux/seccomp.h linux/filter.h],
+ [AC_CHECK_DECLS([SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC, SECCOMP_RET_TRACE],
+ [AC_DEFINE([HAVE_SECCOMP], [1])], [],
+ [[#include ]])])
+
# Make the assembler optimize for code size. Don't do this on MIPS,
# as the assembler code manages branch delays manually.
@@ -547,7 +557,9 @@ FIND_DELETE=$exec_cv_find_delete
AC_SUBST([FIND_DELETE])
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile config-mips.m4])
+AC_CONFIG_FILES([Makefile])
+AS_IF([test "x$is_mips" = xyes],
+ [AC_CONFIG_FILES ([config-mips.m4])])
AC_SUBST([AUTO_DEPEND])
AC_SUBST([LOADERFLAGS])
@@ -556,5 +568,6 @@ AC_SUBST([ASFLAGS])
AC_SUBST([exec_loader])
AC_SUBST([MIPS_N32])
AC_SUBST([OBJS])
+AC_SUBST([is_mips])
AC_OUTPUT
diff --git a/exec/exec.c b/exec/exec.c
index cbe22d4f18c..775a8b06b96 100644
--- a/exec/exec.c
+++ b/exec/exec.c
@@ -292,7 +292,9 @@ write_load_command (program_header *header, bool use_alternate,
struct exec_map_command command1;
USER_WORD start, end;
bool need_command1;
+#ifndef PAGE_MASK
static long pagesize;
+#endif /* !PAGE_MASK */
/* First, write the commands necessary to map the specified segment
itself.
@@ -306,14 +308,14 @@ write_load_command (program_header *header, bool use_alternate,
#ifdef HAVE_GETPAGESIZE
if (!pagesize)
pagesize = getpagesize ();
-#else /* HAVE_GETPAGESIZE */
+#else /* !HAVE_GETPAGESIZE */
if (!pagesize)
pagesize = sysconf (_SC_PAGESIZE);
-#endif /* HAVE_GETPAGESIZE */
+#endif /* !HAVE_GETPAGESIZE */
#define PAGE_MASK (~(pagesize - 1))
#define PAGE_SIZE (pagesize)
-#endif /* PAGE_MASK */
+#endif /* !PAGE_MASK */
start = header->p_vaddr & PAGE_MASK;
end = ((header->p_vaddr + header->p_filesz
@@ -895,10 +897,6 @@ format_pid (char *in, unsigned int pid)
with #!; in that case, find the program to open and use that
instead.
- If REENTRANT is not defined, NAME is actually a buffer of size
- PATH_MAX + 80. In that case, copy over the file name actually
- opened.
-
Next, read the executable header, and add the necessary memory
mappings for each file. Finally, return the action data and its
size in *SIZE.
@@ -978,9 +976,7 @@ exec_0 (char *name, struct exec_tracee *tracee,
memcpy (rewrite, name, strnlen (name, remaining));
/* Replace name with buffer1. */
-#ifndef REENTRANT
strcpy (name, buffer1);
-#endif /* REENTRANT */
}
}
diff --git a/exec/exec.h b/exec/exec.h
index 3ce06c35311..59963587573 100644
--- a/exec/exec.h
+++ b/exec/exec.h
@@ -152,6 +152,16 @@ struct exec_tracee
completion. */
USER_WORD sp;
+ /* Name of the executable being run. */
+ char *exec_file;
+
+ /* Pointer to a storage area holding instructions for loading an
+ executable if an `exec' system call is outstanding, or NULL. */
+ char *exec_data;
+
+ /* Number of bytes in exec_data. */
+ size_t data_size;
+
/* The thread ID of this process. */
pid_t pid;
@@ -162,11 +172,6 @@ struct exec_tracee
/* Whether or not the tracee has been created but is not yet
processed by `handle_clone'. */
bool new_child : 1;
-
-#ifndef REENTRANT
- /* Name of the executable being run. */
- char *exec_file;
-#endif /* !REENTRANT */
};
diff --git a/exec/exec1.c b/exec/exec1.c
index aaff9a94c62..cbd756d3d5c 100644
--- a/exec/exec1.c
+++ b/exec/exec1.c
@@ -42,6 +42,9 @@ main (int argc, char **argv)
extern char **environ;
int wstatus;
+ /* Provide the file name of the loader. */
+ exec_init (argv[1]);
+
pid1 = getpid ();
pid = fork ();
@@ -58,9 +61,6 @@ main (int argc, char **argv)
}
else
{
- /* Provide the file name of the loader. */
- exec_init (argv[1]);
-
if (after_fork (pid))
exit (127);
diff --git a/exec/loader-x86.s b/exec/loader-x86.s
index 216bc88f976..3d132dd99e8 100644
--- a/exec/loader-x86.s
+++ b/exec/loader-x86.s
@@ -1,71 +1,68 @@
-define(`CC', `
-dnl')
-
-CC Copyright (C) 2023-2024 Free Software Foundation, Inc.
-CC
-CC This file is part of GNU Emacs.
-CC
-CC GNU Emacs is free software: you can redistribute it and/or modify
-CC it under the terms of the GNU General Public License as published
-CC by the Free Software Foundation, either version 3 of the License,
-CC or (at your option) any later version.
-CC
-CC GNU Emacs is distributed in the hope that it will be useful, but
-CC WITHOUT ANY WARRANTY; without even the implied warranty of
-CC MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-CC General Public License for more details.
-CC
-CC You should have received a copy of the GNU General Public License
-CC along with GNU Emacs. If not, see .
+# Copyright (C) 2023-2024 Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNU Emacs is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs. If not, see .
.section .text
.global _start
_start:
-dnl movl $162, %eax CC SYS_nanosleep
-dnl leal timespec, %ebx
-dnl xorl %ecx, %ecx
-dnl int $0x80
- leal 8(%esp), %ebp CC ebp = start of load area
- subl $8, %esp CC (%esp) = primary fd, 4(%esp) = secondary fd
+# movl $162, %eax # SYS_nanosleep
+# leal timespec, %ebx
+# xorl %ecx, %ecx
+# int $0x80
+ leal 8(%esp), %ebp # ebp = start of load area
+ subl $8, %esp # (%esp) = primary fd, 4(%esp) = secondary fd
movl $-1, 4(%esp)
.next_action:
- movl (%ebp), %edx CC edx = action number
+ movl (%ebp), %edx # edx = action number
andl $-17, %edx
- cmpl $0, %edx CC open file?
+ cmpl $0, %edx # open file?
je .open_file
- cmpl $3, %edx CC jump?
+ cmpl $3, %edx # jump?
je .rest_of_exec
- cmpl $4, %edx CC anonymous mmap?
+ cmpl $4, %edx # anonymous mmap?
je .do_mmap_anon
.do_mmap:
subl $24, %esp
- movl $90, %eax CC SYS_old_mmap
+ movl $90, %eax # SYS_old_mmap
movl %esp, %ebx
- movl 4(%ebp), %ecx CC address
+ movl 4(%ebp), %ecx # address
movl %ecx, (%esp)
- movl 16(%ebp), %ecx CC length
+ movl 16(%ebp), %ecx # length
movl %ecx, 4(%esp)
- movl 12(%ebp), %ecx CC protection
+ movl 12(%ebp), %ecx # protection
movl %ecx, 8(%esp)
- movl 20(%ebp), %ecx CC flags
+ movl 20(%ebp), %ecx # flags
movl %ecx, 12(%esp)
- testl $16, (%ebp) CC primary?
+ testl $16, (%ebp) # primary?
movl 28(%esp), %ecx
cmovzl 24(%esp), %ecx
- movl %ecx, 16(%esp) CC fd
- movl 8(%ebp), %ecx CC offset
+ movl %ecx, 16(%esp) # fd
+ movl 8(%ebp), %ecx # offset
movl %ecx, 20(%esp)
.do_mmap_1:
int $0x80
- addl $24, %esp CC restore esp
- cmpl $-1, %eax CC mmap failed?
+ addl $24, %esp # restore esp
+ cmpl $-1, %eax # mmap failed?
je .perror
- movl 24(%ebp), %ecx CC clear
+ movl 24(%ebp), %ecx # clear
testl %ecx, %ecx
jz .continue
- movl 4(%ebp), %esi CC start of mapping
- addl 16(%ebp), %esi CC end of mapping
- subl %ecx, %esi CC start of clear area
+ movl 4(%ebp), %esi # start of mapping
+ addl 16(%ebp), %esi # end of mapping
+ subl %ecx, %esi # start of clear area
.again:
testl %ecx, %ecx
jz .continue
@@ -77,58 +74,58 @@ dnl int $0x80
jmp .next_action
.do_mmap_anon:
subl $24, %esp
- movl $90, %eax CC SYS_old_mmap
+ movl $90, %eax # SYS_old_mmap
movl %esp, %ebx
- movl 4(%ebp), %ecx CC address
+ movl 4(%ebp), %ecx # address
movl %ecx, (%esp)
- movl 16(%ebp), %ecx CC length
+ movl 16(%ebp), %ecx # length
movl %ecx, 4(%esp)
- movl 12(%ebp), %ecx CC protection
+ movl 12(%ebp), %ecx # protection
movl %ecx, 8(%esp)
- movl 20(%ebp), %ecx CC flags
+ movl 20(%ebp), %ecx # flags
movl %ecx, 12(%esp)
- movl $-1, 16(%esp) CC fd
- movl 8(%ebp), %ecx CC offset
+ movl $-1, 16(%esp) # fd
+ movl 8(%ebp), %ecx # offset
movl %ecx, 20(%esp)
jmp .do_mmap_1
.open_file:
- movl $5, %eax CC SYS_open
- leal 4(%ebp), %ebx CC ebx = %esp + 8
+ movl $5, %eax # SYS_open
+ leal 4(%ebp), %ebx # ebx = %esp + 8
pushl %ebx
- xorl %ecx, %ecx CC flags = O_RDONLY
- xorl %edx, %edx CC mode = 0
+ xorl %ecx, %ecx # flags = O_RDONLY
+ xorl %edx, %edx # mode = 0
int $0x80
- cmpl $-1, %eax CC open failed?
+ cmpl $-1, %eax # open failed?
jle .perror
- movl %ebp, %esi CC (esi) = original action number
- popl %ebp CC ebp = start of string
- movl %ebp, %ecx CC char past separator
+ movl %ebp, %esi # (esi) = original action number
+ popl %ebp # ebp = start of string
+ movl %ebp, %ecx # char past separator
decl %ebp
.nextc:
incl %ebp
- movb (%ebp), %dl CC dl = *ebp
- cmpb $47, %dl CC dl == '\?'?
+ movb (%ebp), %dl # dl = *ebp
+ cmpb $47, %dl # dl == '\?'?
jne .nextc1
- leal 1(%ebp), %ecx CC ecx = char past separator
+ leal 1(%ebp), %ecx # ecx = char past separator
.nextc1:
- cmpb $0, %dl CC dl == 0?
+ cmpb $0, %dl # dl == 0?
jne .nextc
- addl $4, %ebp CC adjust past ebp prior to rounding
- andl $-4, %ebp CC round ebp up to the next long
- testl $16, (%esi) CC original action number & 16?
+ addl $4, %ebp # adjust past ebp prior to rounding
+ andl $-4, %ebp # round ebp up to the next long
+ testl $16, (%esi) # original action number & 16?
jz .primary
- movl %eax, 4(%esp) CC secondary fd = eax
+ movl %eax, 4(%esp) # secondary fd = eax
jmp .next_action
.primary:
pushl %ebp
- xorl %esi, %esi CC arg3
- movl %eax, 4(%esp) CC primary fd = eax
- xorl %edx, %edx CC arg2
- movl $15, %ebx CC PR_SET_NAME, arg1 = ecx
- xorl %edi, %edi CC arg4
- movl $172, %eax CC SYS_prctl
- xorl %ebp, %ebp CC arg5
- int $0x80 CC syscall
+ xorl %esi, %esi # arg3
+ movl %eax, 4(%esp) # primary fd = eax
+ xorl %edx, %edx # arg2
+ movl $15, %ebx # PR_SET_NAME, arg1 = ecx
+ xorl %edi, %edi # arg4
+ movl $172, %eax # SYS_prctl
+ xorl %ebp, %ebp # arg5
+ int $0x80 # syscall
popl %ebp
jmp .next_action
.perror:
@@ -137,28 +134,28 @@ dnl int $0x80
movl $1, %eax
int $0x80
.rest_of_exec:
- movl 8(%esp), %ecx CC ecx = original stack pointer
- movl (%ecx), %esi CC esi = argc
- leal 8(%ecx, %esi, 4), %ecx CC ecx = start of environ
+ movl 8(%esp), %ecx # ecx = original stack pointer
+ movl (%ecx), %esi # esi = argc
+ leal 8(%ecx, %esi, 4), %ecx # ecx = start of environ
.skip_environ:
- movl (%ecx), %esi CC envp[N]
+ movl (%ecx), %esi # envp[N]
addl $4, %ecx
- testl %esi, %esi CC envp[n] ?
- jnz .skip_environ CC otherwise, esi is now at the start of auxv
+ testl %esi, %esi # envp[n] ?
+ jnz .skip_environ # otherwise, esi is now at the start of auxv
.one_auxv:
- movl (%ecx), %esi CC auxv type
- leal 8(%ecx), %ecx CC skip to next auxv
- testl %esi, %esi CC is 0?
+ movl (%ecx), %esi # auxv type
+ leal 8(%ecx), %ecx # skip to next auxv
+ testl %esi, %esi # is 0?
jz .cleanup
- cmpl $3, %esi CC is AT_PHDR
+ cmpl $3, %esi # is AT_PHDR
je .replace_phdr
- cmpl $4, %esi CC is AT_PHENT?
+ cmpl $4, %esi # is AT_PHENT?
je .replace_phent
- cmpl $5, %esi CC is AT_PHNUM?
+ cmpl $5, %esi # is AT_PHNUM?
je .replace_phnum
- cmpl $9, %esi CC is AT_ENTRY?
+ cmpl $9, %esi # is AT_ENTRY?
je .replace_entry
- cmpl $7, %esi CC is AT_BASE
+ cmpl $7, %esi # is AT_BASE
je .replace_base
jmp .one_auxv
.replace_phdr:
@@ -182,21 +179,21 @@ dnl int $0x80
movl %esi, -4(%ecx)
jmp .one_auxv
.cleanup:
- movl $6, %eax CC SYS_close
- cmpl $-1, 4(%esp) CC see if interpreter fd is set
+ movl $6, %eax # SYS_close
+ cmpl $-1, 4(%esp) # see if interpreter fd is set
je .cleanup_1
movl 4(%esp), %ebx
int $0x80
- movl $6, %eax CC SYS_close
+ movl $6, %eax # SYS_close
.cleanup_1:
movl (%esp), %ebx
int $0x80
.enter:
pushl $0
- popfl CC restore floating point state
- movl 8(%esp), %esp CC restore initial stack pointer
- xorl %edx, %edx CC clear rtld_fini
- jmpl *4(%ebp) CC entry
+ popfl # restore floating point state
+ movl 8(%esp), %esp # restore initial stack pointer
+ xorl %edx, %edx # clear rtld_fini
+ jmpl *4(%ebp) # entry
timespec:
.long 10
diff --git a/exec/loader-x86_64.s b/exec/loader-x86_64.s
index 2ef779e4504..ea2958b91e0 100644
--- a/exec/loader-x86_64.s
+++ b/exec/loader-x86_64.s
@@ -1,64 +1,61 @@
-define(`CC', `
-dnl')
-
-CC Copyright (C) 2023-2024 Free Software Foundation, Inc.
-CC
-CC This file is part of GNU Emacs.
-CC
-CC GNU Emacs is free software: you can redistribute it and/or modify
-CC it under the terms of the GNU General Public License as published
-CC by the Free Software Foundation, either version 3 of the License,
-CC or (at your option) any later version.
-CC
-CC GNU Emacs is distributed in the hope that it will be useful, but
-CC WITHOUT ANY WARRANTY; without even the implied warranty of
-CC MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-CC General Public License for more details.
-CC
-CC You should have received a copy of the GNU General Public License
-CC along with GNU Emacs. If not, see .
+# Copyright (C) 2023-2024 Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNU Emacs is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs. If not, see .
.section .text
.global _start
_start:
-dnl movq $35, %rax CC SYS_nanosleep
-dnl leaq timespec(%rip), %rdi
-dnl xorq %rsi, %rsi
-dnl syscall
- popq %r13 CC original SP
- popq %r15 CC size of load area.
- movq $-1, %r12 CC r12 is the interpreter fd
+# movq $35, %rax # SYS_nanosleep
+# leaq timespec(%rip), %rdi
+# xorq %rsi, %rsi
+# syscall
+ popq %r13 # original SP
+ popq %r15 # size of load area.
+ movq $-1, %r12 # r12 is the interpreter fd
.next_action:
- movq (%rsp), %r14 CC action number
- movq %r14, %r15 CC original action number
+ movq (%rsp), %r14 # action number
+ movq %r14, %r15 # original action number
andq $-17, %r14
- cmpq $0, %r14 CC open file?
+ cmpq $0, %r14 # open file?
je .open_file
- cmpq $3, %r14 CC jump?
+ cmpq $3, %r14 # jump?
je .rest_of_exec
- cmpq $4, %r14 CC anonymous mmap?
+ cmpq $4, %r14 # anonymous mmap?
je .do_mmap_anon
.do_mmap:
- movq $9, %rax CC SYS_mmap
- movq 8(%rsp), %rdi CC address
- movq 16(%rsp), %r9 CC offset
- movq 24(%rsp), %rdx CC protection
- movq 32(%rsp), %rsi CC length
- movq 40(%rsp), %r10 CC flags
- CC set r8 to the primary fd unless r15 & 16
+ movq $9, %rax # SYS_mmap
+ movq 8(%rsp), %rdi # address
+ movq 16(%rsp), %r9 # offset
+ movq 24(%rsp), %rdx # protection
+ movq 32(%rsp), %rsi # length
+ movq 40(%rsp), %r10 # flags
+ # set r8 to the primary fd unless r15 & 16
testq $16, %r15
movq %r12, %r8
cmovzq %rbx, %r8
.do_mmap_1:
syscall
- cmpq $-1, %rax CC mmap failed
+ cmpq $-1, %rax # mmap failed
je .perror
- movq 48(%rsp), %r9 CC clear
+ movq 48(%rsp), %r9 # clear
testq %r9, %r9
jz .continue
- movq 8(%rsp), %r10 CC start of mapping
- addq 32(%rsp), %r10 CC end of mapping
- subq %r9, %r10 CC start of clear area
+ movq 8(%rsp), %r10 # start of mapping
+ addq 32(%rsp), %r10 # end of mapping
+ subq %r9, %r10 # start of clear area
.again:
testq %r9, %r9
jz .continue
@@ -69,124 +66,124 @@ dnl syscall
leaq 56(%rsp), %rsp
jmp .next_action
.do_mmap_anon:
- movq $9, %rax CC SYS_mmap
- movq 8(%rsp), %rdi CC address
- movq 16(%rsp), %r9 CC offset
- movq 24(%rsp), %rdx CC protection
- movq 32(%rsp), %rsi CC length
- movq 40(%rsp), %r10 CC flags
- movq $-1, %r8 CC -1
+ movq $9, %rax # SYS_mmap
+ movq 8(%rsp), %rdi # address
+ movq 16(%rsp), %r9 # offset
+ movq 24(%rsp), %rdx # protection
+ movq 32(%rsp), %rsi # length
+ movq 40(%rsp), %r10 # flags
+ movq $-1, %r8 # -1
jmp .do_mmap_1
.open_file:
- movq $2, %rax CC SYS_open
- leaq 8(%rsp), %rdi CC rdi = %rsp + 8
- xorq %rsi, %rsi CC flags = O_RDONLY
- xorq %rdx, %rdx CC mode = 0
+ movq $2, %rax # SYS_open
+ leaq 8(%rsp), %rdi # rdi = %rsp + 8
+ xorq %rsi, %rsi # flags = O_RDONLY
+ xorq %rdx, %rdx # mode = 0
syscall
- cmpq $-1, %rax CC open failed
+ cmpq $-1, %rax # open failed
jle .perror
- movq %rdi, %rsp CC rsp = start of string
+ movq %rdi, %rsp # rsp = start of string
subq $1, %rsp
- movq %rsp, %r14 CC r14 = start of string
+ movq %rsp, %r14 # r14 = start of string
.nextc:
addq $1, %rsp
- movb (%rsp), %dil CC rdi = *rsp
- cmpb $47, %dil CC *rsp == '/'?
+ movb (%rsp), %dil # rdi = *rsp
+ cmpb $47, %dil # *rsp == '/'?
jne .nextc1
- movq %rsp, %r14 CC r14 = rsp
- addq $1, %r14 CC r14 = char past separator
+ movq %rsp, %r14 # r14 = rsp
+ addq $1, %r14 # r14 = char past separator
.nextc1:
- cmpb $0, %dil CC *rsp == 0?
+ cmpb $0, %dil # *rsp == 0?
jne .nextc
- addq $8, %rsp CC adjust past rsp prior to rounding
- andq $-8, %rsp CC round rsp up to the next quad
- testq $16, %r15 CC r15 & 16?
+ addq $8, %rsp # adjust past rsp prior to rounding
+ andq $-8, %rsp # round rsp up to the next quad
+ testq $16, %r15 # r15 & 16?
jz .primary
- movq %rax, %r12 CC otherwise, move fd to r12
+ movq %rax, %r12 # otherwise, move fd to r12
jmp .next_action
.primary:
- movq %rax, %rbx CC if not, move fd to rbx
- movq $157, %rax CC SYS_prctl
- movq $15, %rdi CC PR_SET_NAME
- movq %r14, %rsi CC arg1
- xorq %rdx, %rdx CC arg2
- xorq %r10, %r10 CC arg3
- xorq %r8, %r8 CC arg4
- xorq %r9, %r9 CC arg5
+ movq %rax, %rbx # if not, move fd to rbx
+ movq $157, %rax # SYS_prctl
+ movq $15, %rdi # PR_SET_NAME
+ movq %r14, %rsi # arg1
+ xorq %rdx, %rdx # arg2
+ xorq %r10, %r10 # arg3
+ xorq %r8, %r8 # arg4
+ xorq %r9, %r9 # arg5
syscall
jmp .next_action
.perror:
- movq %rax, %r12 CC error code
+ movq %rax, %r12 # error code
negq %r12
- movq $1, %rax CC SYS_write
- movq $1, %rdi CC stdout
- leaq error(%rip), %rsi CC buffer
- movq $23, %rdx CC count
+ movq $1, %rax # SYS_write
+ movq $1, %rdi # stdout
+ leaq error(%rip), %rsi # buffer
+ movq $23, %rdx # count
syscall
- movq $60, %rax CC SYS_exit
- movq %r12, %rdi CC code
+ movq $60, %rax # SYS_exit
+ movq %r12, %rdi # code
syscall
-.rest_of_exec: CC rsp now points to six quads:
- movq %rsp, %r8 CC now, they are r8
- movq %r13, %rsp CC restore SP
- popq %r10 CC argc
- leaq 8(%rsp,%r10,8), %rsp CC now at start of environ
+.rest_of_exec: # rsp now points to six quads:
+ movq %rsp, %r8 # now, they are r8
+ movq %r13, %rsp # restore SP
+ popq %r10 # argc
+ leaq 8(%rsp,%r10,8), %rsp # now at start of environ
.skip_environ:
- popq %r10 CC envp[N]
- testq %r10, %r10 CC envp[n]?
- jnz .skip_environ CC otherwise, rsp is now at the start of auxv
+ popq %r10 # envp[N]
+ testq %r10, %r10 # envp[n]?
+ jnz .skip_environ # otherwise, rsp is now at the start of auxv
.one_auxv:
- popq %rcx CC auxv type
- addq $8, %rsp CC skip value
- testq %rcx, %rcx CC is 0?
+ popq %rcx # auxv type
+ addq $8, %rsp # skip value
+ testq %rcx, %rcx # is 0?
jz .cleanup
- cmpq $3, %rcx CC is AT_PHDR?
+ cmpq $3, %rcx # is AT_PHDR?
je .replace_phdr
- cmpq $4, %rcx CC is AT_PHENT?
+ cmpq $4, %rcx # is AT_PHENT?
je .replace_phent
- cmpq $5, %rcx CC is AT_PHNUM?
+ cmpq $5, %rcx # is AT_PHNUM?
je .replace_phnum
- cmpq $9, %rcx CC is AT_ENTRY?
+ cmpq $9, %rcx # is AT_ENTRY?
je .replace_entry
- cmpq $7, %rcx CC is AT_BASE?
+ cmpq $7, %rcx # is AT_BASE?
je .replace_base
jmp .one_auxv
.replace_phdr:
movq 40(%r8), %r9
- movq %r9, -8(%rsp) CC set at_phdr
+ movq %r9, -8(%rsp) # set at_phdr
jmp .one_auxv
.replace_phent:
movq 24(%r8), %r9
- movq %r9, -8(%rsp) CC set at_phent
+ movq %r9, -8(%rsp) # set at_phent
jmp .one_auxv
.replace_phnum:
movq 32(%r8), %r9
- movq %r9, -8(%rsp) CC set at_phnum
+ movq %r9, -8(%rsp) # set at_phnum
jmp .one_auxv
.replace_entry:
movq 16(%r8), %r9
- movq %r9, -8(%rsp) CC set at_entry
+ movq %r9, -8(%rsp) # set at_entry
jmp .one_auxv
.replace_base:
movq 48(%r8), %r9
- movq %r9, -8(%rsp) CC set at_base
+ movq %r9, -8(%rsp) # set at_base
jmp .one_auxv
.cleanup:
- movq $3, %rax CC SYS_close
- cmpq $-1, %r12 CC see if interpreter fd is set
+ movq $3, %rax # SYS_close
+ cmpq $-1, %r12 # see if interpreter fd is set
je .cleanup_1
movq %r12, %rdi
syscall
- movq $3, %rax CC SYS_close
+ movq $3, %rax # SYS_close
.cleanup_1:
movq %rbx, %rdi
syscall
.enter:
pushq $0
- popfq CC clear FP state
- movq %r13, %rsp CC restore SP
- xorq %rdx, %rdx CC clear rtld_fini
- jmpq *8(%r8) CC entry
+ popfq # clear FP state
+ movq %r13, %rsp # restore SP
+ xorq %rdx, %rdx # clear rtld_fini
+ jmpq *8(%r8) # entry
error:
.ascii "_start: internal error."
diff --git a/exec/mipsel-user.h b/exec/mipsel-user.h
index 04f4a2a5089..14d8f6d0d5e 100644
--- a/exec/mipsel-user.h
+++ b/exec/mipsel-user.h
@@ -24,10 +24,6 @@ along with GNU Emacs. If not, see . */
#include
-#ifndef ELF_NGREG
-#define ELF_NGREG 45
-#endif /* ELF_NGREG */
-
/* This file defines a structure containing user mode general purpose
@@ -36,7 +32,15 @@ along with GNU Emacs. If not, see . */
struct mipsel_regs
{
/* General purpose registers. */
- uint64_t gregs[ELF_NGREG];
+ uint64_t gregs[32];
+
+ /* Saved special registers. */
+ uint64_t lo;
+ uint64_t hi;
+ uint64_t cp0_epc;
+ uint64_t cp0_badvaddr;
+ uint64_t cp0_status;
+ uint64_t cp0_cause;
};
#endif /* _MIPSEL_USER_H_ */
diff --git a/exec/trace.c b/exec/trace.c
index 05d862f5b9f..2af6d867efe 100644
--- a/exec/trace.c
+++ b/exec/trace.c
@@ -49,11 +49,21 @@ along with GNU Emacs. If not, see . */
#ifndef SYS_SECCOMP
#define SYS_SECCOMP 1
-#endif /* SYS_SECCOMP */
+#endif /* !defined SYS_SECCOMP */
#ifndef PTRACE_GETEVENTMSG
#define PTRACE_GETEVENTMSG 0x4201
-#endif /* PTRACE_GETEVENTMSG */
+#endif /* !defined PTRACE_GETEVENTMSG */
+
+#ifdef HAVE_SECCOMP
+#include
+#include
+
+#include
+#include
+
+#include
+#endif /* !defined HAVE_SECCOMP */
@@ -70,6 +80,15 @@ along with GNU Emacs. If not, see . */
/* Number of tracees children are allowed to create. */
#define MAX_TRACEES 4096
+#ifdef HAVE_SECCOMP
+
+/* Whether to enable seccomp acceleration. */
+static bool use_seccomp_p;
+
+#else /* !HAVE_SECCOMP */
+#define use_seccomp_p (false)
+#endif /* HAVE_SECCOMP */
+
#ifdef __aarch64__
/* Place PID's registers into *REGS. Return 1 upon failure, else
@@ -105,8 +124,7 @@ aarch64_set_regs (pid_t pid, USER_REGS_STRUCT *regs,
iov.iov_base = regs;
iov.iov_len = sizeof *regs;
- rc = ptrace (PTRACE_SETREGSET, pid, NT_PRSTATUS,
- &iov);
+ rc = ptrace (PTRACE_SETREGSET, pid, NT_PRSTATUS, &iov);
if (rc < 0)
return 1;
@@ -367,14 +385,17 @@ remove_tracee (struct exec_tracee *tracee)
/* Link the tracee onto the list of free tracees. */
tracee->next = free_tracees;
-#ifndef REENTRANT
/* Free the exec file, if any. */
free (tracee->exec_file);
tracee->exec_file = NULL;
-#endif /* REENTRANT */
+ /* Likewise with any loader instructions that might be
+ present. */
+ free (tracee->exec_data);
+ tracee->exec_data = NULL;
+
+ /* Return this tracee to the list of free ones. */
free_tracees = tracee;
-
return;
}
else
@@ -419,7 +440,6 @@ find_tracee (pid_t process)
static void
handle_clone_prepare (struct exec_tracee *parent)
{
-#ifndef REENTRANT
long rc;
unsigned long pid;
struct exec_tracee *tracee;
@@ -440,7 +460,8 @@ handle_clone_prepare (struct exec_tracee *parent)
assert (tracee->new_child);
tracee->new_child = false;
tracee->exec_file = NULL;
- ptrace (PTRACE_SYSCALL, tracee->pid, 0, 0);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, 0, 0);
if (parent->exec_file)
tracee->exec_file = strdup (parent->exec_file);
@@ -457,12 +478,9 @@ handle_clone_prepare (struct exec_tracee *parent)
tracee = &static_tracees[tracees];
tracees++;
}
-#ifndef REENTRANT
- /* Try to allocate a tracee using `malloc' if this library is
- not being built to run inside a signal handler. */
+ /* Try to allocate a tracee using `malloc'. */
else if ((tracee = malloc (sizeof *tracee)))
;
-#endif /* REENTRANT */
else
return;
@@ -477,7 +495,6 @@ handle_clone_prepare (struct exec_tracee *parent)
if (parent->exec_file)
tracee->exec_file = strdup (parent->exec_file);
-#endif /* REENTRANT */
}
/* Handle the completion of a `clone' or `clone3' system call,
@@ -513,21 +530,18 @@ handle_clone (struct exec_tracee *tracee, pid_t pid)
tracee = &static_tracees[tracees];
tracees++;
}
-#ifndef REENTRANT
- /* Try to allocate a tracee using `malloc' if this library is
- not being built to run inside a signal handler. */
+ /* Try to allocate a tracee using `malloc'. */
else if ((tracee = malloc (sizeof *tracee)))
;
-#endif /* REENTRANT */
else
return 1;
tracee->pid = pid;
tracee->next = tracing_processes;
tracee->waiting_for_syscall = false;
-#ifndef REENTRANT
tracee->exec_file = NULL;
-#endif /* REENTRANT */
+ tracee->exec_data = NULL;
+ tracee->data_size = 0;
tracing_processes = tracee;
tracee->new_child = true;
@@ -549,6 +563,11 @@ handle_clone (struct exec_tracee *tracee, pid_t pid)
flags |= PTRACE_O_TRACESYSGOOD;
flags |= PTRACE_O_TRACEEXIT;
+#ifdef HAVE_SECCOMP
+ if (use_seccomp_p)
+ flags |= PTRACE_O_TRACESECCOMP;
+#endif /* HAVE_SECCOMP */
+
rc = ptrace (PTRACE_SETOPTIONS, pid, 0, flags);
if (rc)
@@ -559,7 +578,8 @@ handle_clone (struct exec_tracee *tracee, pid_t pid)
/* The new tracee is currently stopped. Continue it until the next
system call. */
- rc = ptrace (PTRACE_SYSCALL, pid, 0, 0);
+ rc = ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ pid, 0, 0);
if (rc)
goto bail;
@@ -618,9 +638,11 @@ check_signal (struct exec_tracee *tracee, int status)
{
if (siginfo.si_code < 0)
/* SIGTRAP delivered from userspace. Pass it on. */
- ptrace (PTRACE_SYSCALL, tracee->pid, 0, SIGTRAP);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, 0, SIGTRAP);
else
- ptrace (PTRACE_SYSCALL, tracee->pid, 0, 0);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, 0, 0);
return 1;
}
@@ -639,26 +661,28 @@ check_signal (struct exec_tracee *tracee, int status)
it. */
#ifdef HAVE_SIGINFO_T_SI_SYSCALL
#ifndef __arm__
- ptrace (PTRACE_SYSCALL, tracee->pid,
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL), tracee->pid,
0, ((siginfo.si_code == SYS_SECCOMP
&& siginfo.si_syscall == -1)
? 0 : status));
#else /* __arm__ */
- ptrace (PTRACE_SYSCALL, tracee->pid,
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL), tracee->pid,
0, ((siginfo.si_code == SYS_SECCOMP
&& siginfo.si_syscall == 222)
? 0 : status));
#endif /* !__arm__ */
#else /* !HAVE_SIGINFO_T_SI_SYSCALL */
/* Drop this signal, since what caused it is unknown. */
- ptrace (PTRACE_SYSCALL, tracee->pid, 0, 0);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL), tracee->pid,
+ 0, 0);
#endif /* HAVE_SIGINFO_T_SI_SYSCALL */
return 1;
#endif /* SIGSYS */
default:
/* Continue the process until the next syscall. */
- ptrace (PTRACE_SYSCALL, tracee->pid, 0, status);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, 0, status);
return 1;
}
@@ -667,17 +691,16 @@ check_signal (struct exec_tracee *tracee, int status)
-/* Handle an `exec' system call from the given TRACEE. REGS are the
- tracee's current user-mode registers.
+/* Handle the first stage of an `exec' system call from the given
+ TRACEE. REGS are the tracee's current user-mode registers.
Rewrite the system call arguments to use the loader binary. Then,
- continue the system call until the loader is loaded. Write the
- information necessary to load the original executable into the
- loader's stack.
+ resume the process till the loader is loaded and about to begin
+ execution. Save instructions to load the original executable into
+ TRACEE->exec_data.
Value is 0 upon success, 1 upon a generic failure before the loader
- is loaded, 2 if the process has stopped, and 3 if something failed,
- but it is too late to handle it.
+ is loaded.
Set errno appropriately upon returning a generic failure. */
@@ -687,16 +710,10 @@ handle_exec (struct exec_tracee *tracee, USER_REGS_STRUCT *regs)
char buffer[PATH_MAX + 80], *area;
USER_REGS_STRUCT original;
size_t size, loader_size;
- USER_WORD loader, size1, sp;
- int rc, wstatus;
- siginfo_t siginfo;
-
- /* Save the old stack pointer. */
- sp = regs->STACK_POINTER;
+ USER_WORD loader;
/* Read the file name. */
- read_memory (tracee, buffer, PATH_MAX,
- regs->SYSCALL_ARG_REG);
+ read_memory (tracee, buffer, PATH_MAX, regs->SYSCALL_ARG_REG);
/* Make sure BUFFER is NULL terminated. */
@@ -722,8 +739,18 @@ handle_exec (struct exec_tracee *tracee, USER_REGS_STRUCT *regs)
return 1;
}
- /* Rewrite the first argument to point to the loader. */
+ /* Save this area in the tracee. */
+ assert (!tracee->exec_data);
+ tracee->exec_data = malloc (size);
+ if (!tracee->exec_data)
+ {
+ errno = ENOMEM;
+ return 1;
+ }
+ memcpy (tracee->exec_data, area, size);
+ tracee->data_size = size;
+ /* Rewrite the first argument to point to the loader. */
loader_size = strlen (loader_name) + 1;
loader = user_alloca (tracee, &original, regs,
loader_size);
@@ -731,14 +758,14 @@ handle_exec (struct exec_tracee *tracee, USER_REGS_STRUCT *regs)
if (!loader)
{
errno = ENOMEM;
- return 1;
+ goto free_data_error;
}
if (user_copy (tracee, (unsigned char *) loader_name,
loader, loader_size))
{
errno = EIO;
- return 1;
+ goto free_data_error;
}
regs->SYSCALL_ARG_REG = loader;
@@ -748,151 +775,118 @@ handle_exec (struct exec_tracee *tracee, USER_REGS_STRUCT *regs)
if (aarch64_set_regs (tracee->pid, regs, false))
{
errno = EIO;
- return 1;
+ goto free_data_error;
}
#else /* !__aarch64__ */
- if (ptrace (PTRACE_SETREGS, tracee->pid, NULL,
- regs))
+ if (ptrace (PTRACE_SETREGS, tracee->pid, NULL, regs))
{
errno = EIO;
- return 1;
+ goto free_data_error;
}
#endif /* __aarch64__ */
- /* Continue the system call until loader starts. */
+ /* Resume the process till the loader is executed. */
if (ptrace (PTRACE_SYSCALL, tracee->pid, NULL, NULL))
{
errno = EIO;
- return 1;
+ goto free_data_error;
}
-#ifndef REENTRANT
- /* Now that the loader has started, record the value to use for
- /proc/self/exe. Don't give up just because strdup fails.
+ /* Now that the loader has been executed, record the value to
+ substitute for /proc/self/exe. Don't give up just because strdup
+ fails.
Note that exec_0 copies the absolute file name into buffer. */
if (tracee->exec_file)
free (tracee->exec_file);
tracee->exec_file = strdup (buffer);
-#endif /* REENTRANT */
+ return 0;
- again:
- rc = waitpid (tracee->pid, &wstatus, __WALL);
- if (rc == -1 && errno == EINTR)
- goto again;
+ free_data_error:
+ free (tracee->exec_data);
+ tracee->exec_data = NULL;
+ return 1;
+}
- if (rc < 0)
- return 1;
+/* Complete an `exec' system call issued by TRACEE. Write the
+ instructions stored in TRACEE->exec_data to an appropriate location
+ in TRACEE's stack, and resume TRACEE, releasing TRACEE->exec_data.
+ REGS should be the TRACEE's user registers. If the reissued system
+ call did not succeed in starting the executable loader, restore
+ TRACEE->sp (recorded by process_system_call or seccomp_system_call),
+ and resume execution, so that the failure may be reported. */
- if (!WIFSTOPPED (wstatus))
- /* The process has been killed in response to a signal.
- In this case, simply return 2. */
- return 2;
- else
- {
- /* Then, check if STATUS is not a syscall-stop, and try again if
- it isn't. */
- rc = check_signal (tracee, wstatus);
+static void
+finish_exec (struct exec_tracee *tracee, USER_REGS_STRUCT *regs)
+{
+ USER_WORD size1, loader;
+ USER_REGS_STRUCT original;
- if (rc == -1)
- return 2;
- else if (rc)
- goto again;
+ size1 = tracee->data_size;
- /* Retrieve the signal information and determine whether or not
- the system call has completed. */
+ /* Record the registers' values as they originally were. */
+ memcpy (&original, regs, sizeof *regs);
- if (ptrace (PTRACE_GETSIGINFO, tracee->pid, 0,
- &siginfo))
- return 3;
-
- if (!syscall_trap_p (&siginfo))
- {
- /* Continue. */
- if (ptrace (PTRACE_SYSCALL, tracee->pid, 0, 0))
- return 3;
-
- goto again;
- }
- }
-
-#ifdef __aarch64__
-
- if (aarch64_get_regs (tracee->pid, &original))
- return 3;
-
-#else /* !__aarch64__ */
-
- /* The system call has now completed. Get the registers again. */
-
- if (ptrace (PTRACE_GETREGS, tracee->pid, NULL,
- &original))
- return 3;
-
-#endif /* __aarch64__ */
-
- *regs = original;
-
- /* Upon failure, wait for the next system call and return
- success. */
+ /* Any non-zero value of `original.SYSCALL_RET_REG' indicates that the
+ reissued `exec' call was unsuccessful, and the loader is not
+ executing. Restore the previous stack pointer and permit the
+ tracee to run to completion. */
if (original.SYSCALL_RET_REG)
{
- /* Restore the original stack pointer. */
- regs->STACK_POINTER = sp;
-
+ regs->STACK_POINTER = tracee->sp;
#ifdef __aarch64__
aarch64_set_regs (tracee->pid, regs, false);
#else /* !__aarch64__ */
ptrace (PTRACE_SETREGS, tracee->pid, NULL, regs);
#endif /* __aarch64__ */
- goto exec_failure;
+ /* Continue; not much in the way of remediation is available if
+ either of PTRACE_SETREGS and this resumption fails. */
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, 0, 0);
+ goto error;
}
/* Write the loader area to the stack, followed by its size and the
original stack pointer. */
loader = user_alloca (tracee, &original, regs,
- size + sizeof loader * 2);
+ size1 + sizeof loader * 2);
if (!loader)
- return 3;
-
- size1 = size;
+ goto error;
#ifndef STACK_GROWS_DOWNWARDS
-
- NOT_IMPLEMENTED;
-
+ not implemented, you lose.
#else /* STACK_GROWS_DOWNWARDS */
- if (user_copy (tracee, (unsigned char *) area,
- loader + sizeof size1 * 2, size)
+ if (user_copy (tracee, (unsigned char *) tracee->exec_data,
+ loader + sizeof size1 * 2, size1)
|| user_copy (tracee, (unsigned char *) &size1,
loader + sizeof size1, sizeof size1))
- return 3;
+ goto error;
size1 = original.STACK_POINTER;
if (user_copy (tracee, (unsigned char *) &size1,
loader, sizeof size1))
- return 3;
+ goto error;
#endif /* STACK_GROWS_DOWNWARDS */
/* Continue. */
- if (ptrace (PTRACE_SYSCALL, tracee->pid, 0, 0))
- return 3;
+ if (ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, 0, 0))
+ goto error;
- return 0;
-
- exec_failure:
- return 3;
+ error:
+ free (tracee->exec_data);
+ tracee->exec_data = NULL;
}
@@ -1007,13 +1001,6 @@ static int
handle_readlinkat (USER_WORD callno, USER_REGS_STRUCT *regs,
struct exec_tracee *tracee, USER_WORD *result)
{
-#ifdef REENTRANT
- /* readlinkat cannot be handled specially when the library is built
- to be reentrant, as the file name information cannot be
- recorded. */
- return 0;
-#else /* !REENTRANT */
-
char buffer[PATH_MAX + 1];
USER_WORD address, return_buffer, size;
size_t length;
@@ -1086,7 +1073,6 @@ handle_readlinkat (USER_WORD callno, USER_REGS_STRUCT *regs,
*result = length;
return 2;
-#endif /* REENTRANT */
}
/* Handle an `open' or `openat' system call.
@@ -1104,12 +1090,6 @@ static int
handle_openat (USER_WORD callno, USER_REGS_STRUCT *regs,
struct exec_tracee *tracee, USER_WORD *result)
{
-#ifdef REENTRANT
- /* readlinkat cannot be handled specially when the library is built
- to be reentrant, as the file name information cannot be
- recorded. */
- return 0;
-#else /* !REENTRANT */
char buffer[PATH_MAX + 1];
USER_WORD address;
size_t length;
@@ -1199,7 +1179,6 @@ handle_openat (USER_WORD callno, USER_REGS_STRUCT *regs,
fail:
errno = EIO;
return 1;
-#endif /* REENTRANT */
}
/* Process the system call at which TRACEE is stopped. If the system
@@ -1229,30 +1208,43 @@ process_system_call (struct exec_tracee *tracee)
/* Save the stack pointer. */
sp = regs.STACK_POINTER;
- /* Now dispatch based on the system call. */
- callno = regs.SYSCALL_NUM_REG;
+ /* Now dispatch based on the system call. If TRACEE->exec_data is
+ set, this must be exec, whatever the value of SYSCALL_NUM_REG,
+ which is erased when exec loads another image. */
+
+ callno = (!tracee->exec_data ? regs.SYSCALL_NUM_REG : EXEC_SYSCALL);
switch (callno)
{
case EXEC_SYSCALL:
- /* exec system calls should be handled synchronously. */
- assert (!tracee->waiting_for_syscall);
- rc = handle_exec (tracee, ®s);
-
- switch (rc)
+ if (!tracee->waiting_for_syscall)
{
- case 3:
- /* It's too late to do anything about this error,. */
- break;
+ /* The outstanding syscall flag must not be inconsistent with
+ the presence of instructions for the loader. */
+ assert (!tracee->exec_data);
+ rc = handle_exec (tracee, ®s);
- case 2:
- /* The process has gone away. */
- remove_tracee (tracee);
- break;
+ if (rc)
+ /* An error has occurred; errno is set to the error. */
+ goto report_syscall_error;
- case 1:
- /* An error has occurred; errno is set to the error. */
- goto report_syscall_error;
+ /* The process has been resumed. Assert that the instructions
+ for loading this executable have been generated and
+ recorded, and set waiting_for_syscall. */
+ tracee->waiting_for_syscall = true;
+ assert (tracee->exec_data);
+
+ /* Record the initial stack pointer also. */
+ tracee->sp = sp;
+ }
+ else
+ {
+ assert (tracee->exec_data);
+ finish_exec (tracee, ®s);
+
+ /* The process has been resumed and has become capable of
+ executing independently. */
+ tracee->waiting_for_syscall = false;
}
break;
@@ -1311,7 +1303,7 @@ process_system_call (struct exec_tracee *tracee)
regs.STACK_POINTER = tracee->sp;
#ifdef __aarch64__
- if (aarch64_set_regs (tracee->pid, ®s, true))
+ if (aarch64_set_regs (tracee->pid, ®s, false))
return;
#else /* !__aarch64__ */
if (ptrace (PTRACE_SETREGS, tracee->pid, NULL, ®s))
@@ -1327,11 +1319,35 @@ process_system_call (struct exec_tracee *tracee)
will DTRT upon the next call to PTRACE_SYSCALL after the
syscall-trap signal is delivered. */
- rc = ptrace (PTRACE_SYSCALL, tracee->pid,
+ rc = ptrace (((use_seccomp_p
+ /* open and openat are not processed synchronously,
+ nor can they afford to dispense with
+ post-syscall finalization. */
+
+ && ((callno != OPENAT_SYSCALL
+#ifdef OPEN_SYSCALL
+ && callno != OPEN_SYSCALL
+#endif /* OPEN_SYSCALL */
+ )
+ /* Since syscall initialization should be
+ reserved for seccomp_system_call, resume the
+ process if this system call is already
+ complete. */
+ || !tracee->waiting_for_syscall))
+ ? PTRACE_CONT : PTRACE_SYSCALL), tracee->pid,
NULL, NULL);
if (rc < 0)
return;
+#ifdef HAVE_SECCOMP
+ if (!(use_seccomp_p
+ && ((callno != OPENAT_SYSCALL
+#ifdef OPEN_SYSCALL
+ && callno != OPEN_SYSCALL
+#endif /* OPEN_SYSCALL */
+ )
+ || !tracee->waiting_for_syscall)))
+#endif /* !HAVE_SECCOMP */
tracee->waiting_for_syscall = !tracee->waiting_for_syscall;
}
@@ -1345,9 +1361,10 @@ process_system_call (struct exec_tracee *tracee)
reporting_error = false;
common:
- /* Reporting an error or emulating a system call works by setting
- the system call number to -1, letting it continue, and then
- substituting errno for ENOSYS in the case of an error.
+ /* Reporting an error or emulating a system call works by replacing
+ the system call number with -1 or another nonexistent syscall,
+ letting it continue, and then substituting errno for ENOSYS in the
+ case of an error.
Make sure that the stack pointer is restored to its original
position upon exit, or bad things can happen. */
@@ -1426,7 +1443,347 @@ process_system_call (struct exec_tracee *tracee)
#endif /* __aarch64__ */
/* Now wait for the next system call to happen. */
- ptrace (PTRACE_SYSCALL, tracee->pid, NULL, NULL);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, NULL, NULL);
+ }
+ else
+ {
+ /* No error is being reported. Return the result in the
+ appropriate registers. */
+#ifdef __mips__
+ /* MIPS systems place errno in v0 and set a3 to 1. */
+ regs.gregs[2] = result;
+ regs.gregs[7] = 0;
+#else /* !__mips__ */
+ regs.SYSCALL_RET_REG = result;
+#endif /* __mips__ */
+
+ /* Report errno. */
+#ifdef __aarch64__
+ aarch64_set_regs (tracee->pid, ®s, false);
+#else /* !__aarch64__ */
+ ptrace (PTRACE_SETREGS, tracee->pid, NULL, ®s);
+#endif /* __aarch64__ */
+
+ /* Now wait for the next system call to happen. */
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ tracee->pid, NULL, NULL);
+ }
+}
+
+
+
+#ifdef HAVE_SECCOMP
+
+/* Seccomp acceleration.
+
+ Seccomp enables selectively filtering signals so that the tracing
+ process is only notified of such system calls as it is interested in
+ intercepting, i.e., exec and open*. This improves performance
+ enormously over the traditional approach of pausing the tracee before
+ each system call. */
+
+/* Whether the kernel's version is 4.7.x or earlier. */
+static bool kernel_4_7_or_earlier;
+
+/* Array of system calls this module is interested in intercepting. */
+static int interesting_syscalls[] =
+ {
+ EXEC_SYSCALL,
+#ifdef OPEN_SYSCALL
+ OPEN_SYSCALL,
+#endif /* OPEN_SYSCALL */
+ OPENAT_SYSCALL,
+#ifdef READLINK_SYSCALL
+ READLINK_SYSCALL,
+#endif /* READLINK_SYSCALL */
+ READLINKAT_SYSCALL,
+ };
+
+/* Number of elements in an array. */
+#define ARRAYELTS(arr) (sizeof (arr) / sizeof (arr)[0])
+
+/* Install a secure computing filter that will notify attached tracers
+ when a system call of interest to this module is received. Value is
+ 0 if successful, 1 otherwise. */
+
+static int
+establish_seccomp_filter (void)
+{
+ struct sock_filter statements[1 + ARRAYELTS (interesting_syscalls) + 2];
+ struct sock_fprog program;
+ int index, rc;
+
+ index = 0;
+
+ /* As the exec wrapper will reject executables for an inappropriate
+ architecture, verifying the same here would only be redundant.
+ Proceed to load the current system call number. */
+
+ statements[index++] = ((struct sock_filter)
+ BPF_STMT (BPF_LD + BPF_W + BPF_ABS,
+ offsetof (struct seccomp_data, nr)));
+
+ /* Search for system calls of interest. */
+
+ statements[index]
+ = ((struct sock_filter)
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, EXEC_SYSCALL,
+ ARRAYELTS (interesting_syscalls), 0)); index++;
+#ifdef OPEN_SYSCALL
+ statements[index]
+ = ((struct sock_filter)
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, OPEN_SYSCALL,
+ ARRAYELTS (interesting_syscalls) - index + 1, 0)); index++;
+#endif /* OPEN_SYSCALL */
+ statements[index]
+ = ((struct sock_filter)
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, OPENAT_SYSCALL,
+ ARRAYELTS (interesting_syscalls) - index + 1, 0)); index++;
+#ifdef READLINK_SYSCALL
+ statements[index]
+ = ((struct sock_filter)
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, READLINK_SYSCALL,
+ ARRAYELTS (interesting_syscalls) - index + 1, 0)); index++;
+#endif /* READLINK_SYSCALL */
+ statements[index]
+ = ((struct sock_filter)
+ BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, READLINKAT_SYSCALL,
+ ARRAYELTS (interesting_syscalls) - index + 1, 0)); index++;
+
+ /* If not intercepted above, permit this system call to execute as
+ normal. */
+ statements[index++]
+ = (struct sock_filter) BPF_STMT (BPF_RET + BPF_K, SECCOMP_RET_ALLOW);
+ statements[index++]
+ = (struct sock_filter) BPF_STMT (BPF_RET + BPF_K, SECCOMP_RET_TRACE);
+
+ rc = prctl (PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);
+ if (rc)
+ return 1;
+
+ program.len = ARRAYELTS (statements);
+ program.filter = statements;
+ rc = prctl (PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &program);
+ if (rc)
+ return 1;
+
+ return 0;
+}
+
+/* Intercept or resume and dismiss the system call at which TRACEE is
+ paused, similarly to process_system_call. */
+
+static void
+seccomp_system_call (struct exec_tracee *tracee)
+{
+ USER_REGS_STRUCT regs;
+ int rc, wstatus, save_errno;
+ USER_WORD callno, sp;
+ USER_WORD result;
+ bool reporting_error;
+
+ if (kernel_4_7_or_earlier)
+ {
+ /* On kernel 4.7 and earlier, following a PTRACE_EVENT_SECCOMP by
+ a PTRACE_SYSCALL will give rise to a syscall-entry stop event,
+ and seccomp filters will be suppressed till the system call
+ runs its course. */
+ ptrace (PTRACE_SYSCALL, tracee->pid, 0, 0);
+ return;
+ }
+
+#ifdef __aarch64__
+ rc = aarch64_get_regs (tracee->pid, ®s);
+#else /* !__aarch64__ */
+ rc = ptrace (PTRACE_GETREGS, tracee->pid, NULL,
+ ®s);
+#endif /* __aarch64__ */
+
+ /* TODO: what to do if this fails? */
+ if (rc < 0)
+ return;
+
+ /* On kernel 4.8, processes resumed after being paused so as to
+ produce a PTRACE_EVENT_SECCOMP will execute till the system call
+ completes, or indefinitely if resumed with PTRACE_CONT.
+
+ In this context processes are resumed with PTRACE_CONT unless it is
+ an `open' syscall that is being intercepted, which, if successfully
+ intercepted, they must receive adjustments to their stack pointer
+ upon completion of said system call. */
+ assert (!tracee->waiting_for_syscall);
+
+ /* Save the stack pointer. */
+ sp = regs.STACK_POINTER;
+
+ /* Now dispatch based on the system call. */
+ callno = regs.SYSCALL_NUM_REG;
+ switch (callno)
+ {
+ case EXEC_SYSCALL:
+ assert (!tracee->exec_data);
+ rc = handle_exec (tracee, ®s);
+
+ if (rc)
+ /* An error has occurred; errno is set to the error. */
+ goto report_syscall_error;
+
+ /* The process has been resumed. Assert that the instructions for
+ loading this executable have been generated and recorded, and
+ set waiting_for_syscall. */
+ tracee->waiting_for_syscall = true;
+ assert (tracee->exec_data);
+
+ /* Record the initial stack pointer also. */
+ tracee->sp = sp;
+ break;
+
+#ifdef READLINK_SYSCALL
+ case READLINK_SYSCALL:
+#endif /* READLINK_SYSCALL */
+ case READLINKAT_SYSCALL:
+ /* Handle this readlinkat system call. */
+ rc = handle_readlinkat (callno, ®s, tracee,
+ &result);
+
+ /* rc means the same as in `handle_exec'. */
+
+ if (rc == 1)
+ goto report_syscall_error;
+ else if (rc == 2)
+ goto emulate_syscall;
+
+ goto continue_syscall;
+
+#ifdef OPEN_SYSCALL
+ case OPEN_SYSCALL:
+#endif /* OPEN_SYSCALL */
+ case OPENAT_SYSCALL:
+ /* Handle this open system call. */
+ rc = handle_openat (callno, ®s, tracee, &result);
+
+ /* rc means the same as in `handle_exec', except that `open'
+ is never emulated. */
+
+ if (rc == 1)
+ goto report_syscall_error;
+
+ /* The stack pointer must be restored after it was modified
+ by `user_alloca'; record sp in TRACEE, which will be
+ restored after this system call completes. */
+ tracee->sp = sp;
+
+ /* As such, arrange to enter `process_system_call' on its
+ completion. */
+ rc = ptrace (PTRACE_SYSCALL, tracee->pid,
+ NULL, NULL);
+ if (rc < 0)
+ return;
+
+ tracee->waiting_for_syscall = !tracee->waiting_for_syscall;
+ break;
+
+ default:
+ continue_syscall:
+ rc = ptrace (PTRACE_CONT, tracee->pid, NULL, NULL);
+ if (rc < 0)
+ return;
+ }
+
+ return;
+
+ report_syscall_error:
+ reporting_error = true;
+ goto common;
+
+ emulate_syscall:
+ reporting_error = false;
+ common:
+
+ /* Reporting an error or emulating a system call works by replacing
+ the system call number with -1 or another nonexistent syscall,
+ letting it continue, and then substituting errno for ENOSYS in the
+ case of an error.
+
+ Make sure that the stack pointer is restored to its original
+ position upon exit, or bad things can happen. */
+
+ /* First, save errno; system calls below will clobber it. */
+ save_errno = errno;
+
+ regs.SYSCALL_NUM_REG = -1;
+ regs.STACK_POINTER = sp;
+
+#ifdef __aarch64__
+ if (aarch64_set_regs (tracee->pid, ®s, true))
+ return;
+#else /* !__aarch64__ */
+
+#ifdef __arm__
+ /* On ARM systems, a special request is used to update the system
+ call number as known to the kernel. In addition, the system call
+ number must be valid, so use `tuxcall'. Hopefully, nobody will
+ run this on a kernel with Tux. */
+
+ if (ptrace (PTRACE_SET_SYSCALL, tracee->pid, NULL, 222))
+ return;
+#endif /* __arm__ */
+
+ if (ptrace (PTRACE_SETREGS, tracee->pid, NULL, ®s))
+ return;
+#endif /* __aarch64__ */
+
+ /* Do this invalid system call. */
+ if (ptrace (PTRACE_SYSCALL, tracee->pid, NULL, NULL))
+ return;
+
+ again1:
+ rc = waitpid (tracee->pid, &wstatus, __WALL);
+ if (rc == -1 && errno == EINTR)
+ goto again1;
+
+ /* Return if waitpid fails. */
+
+ if (rc == -1)
+ return;
+
+ /* If the process received a signal, see if the signal is SIGSYS
+ and/or from seccomp. If so, discard it. */
+
+ if (WIFSTOPPED (wstatus))
+ {
+ rc = check_signal (tracee, wstatus);
+
+ if (rc == -1)
+ return;
+ else if (rc)
+ goto again1;
+ }
+
+ if (!WIFSTOPPED (wstatus))
+ /* The process has been killed in response to a signal. In this
+ case, simply unlink the tracee and return. */
+ remove_tracee (tracee);
+ else if (reporting_error)
+ {
+#ifdef __mips__
+ /* MIPS systems place errno in v0 and set a3 to 1. */
+ regs.gregs[2] = save_errno;
+ regs.gregs[7] = 1;
+#else /* !__mips__ */
+ regs.SYSCALL_RET_REG = -save_errno;
+#endif /* __mips__ */
+
+ /* Report errno. */
+#ifdef __aarch64__
+ aarch64_set_regs (tracee->pid, ®s, false);
+#else /* !__aarch64__ */
+ ptrace (PTRACE_SETREGS, tracee->pid, NULL, ®s);
+#endif /* __aarch64__ */
+
+ /* Resume the process till the next interception by its filter. */
+ ptrace (PTRACE_CONT, tracee->pid, NULL, NULL);
}
else
{
@@ -1448,15 +1805,28 @@ process_system_call (struct exec_tracee *tracee)
ptrace (PTRACE_SETREGS, tracee->pid, NULL, ®s);
#endif /* __aarch64__ */
- /* Now wait for the next system call to happen. */
- ptrace (PTRACE_SYSCALL, tracee->pid, NULL, NULL);
+ /* Resume the process till the next interception by its filter. */
+ ptrace (PTRACE_CONT, tracee->pid, NULL, NULL);
}
}
+#ifndef PTRACE_EVENT_SECCOMP
+#define PTRACE_EVENT_SECCOMP 7
+#endif /* !PTRACE_EVENT_SECCOMP */
+
+#ifndef PTRACE_O_TRACESECCOMP
+#define PTRACE_O_TRACESECCOMP (1 << PTRACE_EVENT_SECCOMP)
+#endif /* !PTRACE_O_TRACESECCOMP */
+
+#ifndef SIGSYS
+#define SIGSYS 31
+#endif /* !SIGSYS */
+#endif /* HAVE_SECCOMP */
+
/* Like `execve', but asks the parent to begin tracing this thread.
- Fail if tracing is unsuccessful. */
+ Fail by returning a non-zero value if tracing is unsuccessful. */
int
tracing_execve (const char *file, char *const *argv,
@@ -1471,6 +1841,13 @@ tracing_execve (const char *file, char *const *argv,
/* Notify the parent to enter signal-delivery-stop. */
raise (SIGSTOP);
+
+#ifdef HAVE_SECCOMP
+ /* Install the seccomp filter. */
+ if (use_seccomp_p && establish_seccomp_filter ())
+ return 1;
+#endif /* HAVE_SECCOMP */
+
return execve (file, argv, envp);
}
@@ -1486,6 +1863,10 @@ after_fork (pid_t pid)
{
int wstatus, rc, flags;
struct exec_tracee *tracee;
+#if defined HAVE_SECCOMP && __ANDROID__
+ int statusarg;
+ USER_REGS_STRUCT regs;
+#endif /* defined HAVE_SECCOMP && __ANDROID__ */
/* First, wait for something to happen to PID. */
again:
@@ -1510,6 +1891,10 @@ after_fork (pid_t pid)
flags |= PTRACE_O_TRACEFORK;
flags |= PTRACE_O_TRACESYSGOOD;
flags |= PTRACE_O_TRACEEXIT;
+#ifdef HAVE_SECCOMP
+ if (use_seccomp_p)
+ flags |= PTRACE_O_TRACESECCOMP;
+#endif /* HAVE_SECCOMP */
rc = ptrace (PTRACE_SETOPTIONS, pid, 0, flags);
@@ -1521,12 +1906,86 @@ after_fork (pid_t pid)
return 1;
}
- /* Request that the child stop upon the next system call. */
- rc = ptrace (PTRACE_SYSCALL, pid, 0, 0);
+#if defined HAVE_SECCOMP && __ANDROID__
+ /* Certain Android kernels have received backports of those new
+ PTRACE_EVENT_SECCOMP semantics which were introduced in kernel
+ version 4.8, so that it is necessary to actively establish which
+ variant is in place. */
+
+ if (kernel_4_7_or_earlier && use_seccomp_p)
+ {
+ /* Request that the child stop upon the next `exec' system call,
+ one of which is assumed to always be issued by the child, as
+ below, but await the next stop, and examine its contents.
+ Anciently, the syscall-stop preceeded events marked
+ PTRACE_EVENT_SECCOMP, whereas this sequence is reversed in
+ 4.8+, and in releases with these changes backported. */
+
+ rc = ptrace (PTRACE_SYSCALL, pid, 0, 0);
+ if (rc)
+ return 1;
+
+ while (true)
+ {
+ rc = waitpid (pid, &wstatus, __WALL);
+ if (rc != pid)
+ return 1;
+
+ if (WIFSTOPPED (wstatus))
+ {
+ /* Verify that this system call is `exec', not one issued
+ between PTRACE_TRACEME and `exec' intercepted by
+ PTRACE_SYSCALL. */
+#ifdef __aarch64__
+ rc = aarch64_get_regs (pid, ®s);
+#else /* !__aarch64__ */
+ rc = ptrace (PTRACE_GETREGS, pid, NULL, ®s);
+#endif /* __aarch64__ */
+ if (rc)
+ return 1;
+
+ if (regs.SYSCALL_NUM_REG == EXEC_SYSCALL)
+ {
+ statusarg = ((wstatus & 0xfff00) >> 8);
+
+ if (statusarg == (SIGTRAP | (PTRACE_EVENT_SECCOMP << 8)))
+ {
+ /* The first event to be delivered is a seccomp
+ stop, indicating that this is an unmodified
+ <4.7 kernel. Return to await the subsequent
+ syscall-stop, which should be received and
+ acted on by process_system_call. */
+ rc = ptrace (PTRACE_SYSCALL, pid, 0, 0);
+ break;
+ }
+ else if (statusarg == (SIGTRAP | 0x80))
+ {
+ /* Syscall-traps take priority. This is a
+ doctored 4.7 kernel. */
+ kernel_4_7_or_earlier = false;
+ rc = ptrace (PTRACE_CONT, pid, 0, 0);
+ break;
+ }
+ }
+
+ rc = ptrace (PTRACE_SYSCALL, pid, 0, 0);
+ if (rc)
+ return 1;
+ }
+ else
+ return 1;
+ }
+ }
+ else
+#endif /* HAVE_SECCOMP && __ANDROID__ */
+ /* Request that the child stop upon the next system call, or the
+ next filter event. */
+ rc = ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ pid, 0, 0);
if (rc)
return 1;
- /* Enter the child in `tracing_processes'. */
+ /* Enroll the child into `tracing_processes'. */
if (free_tracees)
{
@@ -1543,9 +2002,9 @@ after_fork (pid_t pid)
tracee->next = tracing_processes;
tracee->waiting_for_syscall = false;
tracee->new_child = false;
-#ifndef REENTRANT
tracee->exec_file = NULL;
-#endif /* REENTRANT */
+ tracee->exec_data = NULL;
+ tracee->data_size = 0;
tracing_processes = tracee;
return 0;
}
@@ -1604,9 +2063,11 @@ exec_waitpid (pid_t pid, int *wstatus, int options)
{
if (siginfo.si_code < 0)
/* SIGTRAP delivered from userspace. Pass it on. */
- ptrace (PTRACE_SYSCALL, pid, 0, SIGTRAP);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ pid, 0, SIGTRAP);
else
- ptrace (PTRACE_SYSCALL, pid, 0, 0);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ pid, 0, 0);
return -1;
}
@@ -1644,9 +2105,17 @@ exec_waitpid (pid_t pid, int *wstatus, int options)
/* These events are handled by tracing SIGSTOP signals sent
to unknown tracees. Make sure not to pass through
status, as there's no signal really being delivered. */
- ptrace (PTRACE_SYSCALL, pid, 0, 0);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL), pid, 0, 0);
return -1;
+#ifdef HAVE_SECCOMP
+ case SIGTRAP | (PTRACE_EVENT_SECCOMP << 8):
+ /* Intercept and process this system call if the event was
+ produced by our filter. */
+ seccomp_system_call (tracee);
+ return -1;
+#endif /* HAVE_SECCOMP */
+
#ifdef SIGSYS
case SIGSYS:
if (ptrace (PTRACE_GETSIGINFO, pid, 0, &siginfo))
@@ -1657,24 +2126,28 @@ exec_waitpid (pid_t pid, int *wstatus, int options)
it. */
#ifdef HAVE_SIGINFO_T_SI_SYSCALL
#ifndef __arm__
- ptrace (PTRACE_SYSCALL, pid, 0, ((siginfo.si_code == SYS_SECCOMP
- && siginfo.si_syscall == -1)
- ? 0 : status));
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ pid, 0, ((siginfo.si_code == SYS_SECCOMP
+ && siginfo.si_syscall == -1)
+ ? 0 : status));
#else /* __arm__ */
- ptrace (PTRACE_SYSCALL, pid, 0, ((siginfo.si_code == SYS_SECCOMP
- && siginfo.si_syscall == 222)
- ? 0 : status));
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ pid, 0, ((siginfo.si_code == SYS_SECCOMP
+ && siginfo.si_syscall == 222)
+ ? 0 : status));
#endif /* !__arm__ */
#else /* !HAVE_SIGINFO_T_SI_SYSCALL */
/* Drop this signal, since what caused it is unknown. */
- ptrace (PTRACE_SYSCALL, pid, 0, 0);
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL), pid,
+ 0, 0);
#endif /* HAVE_SIGINFO_T_SI_SYSCALL */
return -1;
#endif /* SIGSYS */
default:
- /* Continue the process until the next syscall. */
- ptrace (PTRACE_SYSCALL, pid, 0, status);
+ /* Resume the process as appropriate. */
+ ptrace ((use_seccomp_p ? PTRACE_CONT : PTRACE_SYSCALL),
+ pid, 0, status);
return -1;
}
}
@@ -1698,5 +2171,36 @@ exec_waitpid (pid_t pid, int *wstatus, int options)
void
exec_init (const char *loader)
{
+#ifdef HAVE_SECCOMP
+ struct utsname u;
+ int major, minor;
+#endif /* HAVE_SECCOMP */
+
loader_name = loader;
+#ifdef HAVE_SECCOMP
+ errno = 0;
+ prctl (PR_GET_SECCOMP);
+
+ /* PR_GET_SECCOMP should not set errno if the kernel was configured
+ with support for seccomp. */
+ if (!errno)
+ use_seccomp_p = true;
+ else
+ return;
+
+ /* Establish whether the kernel is 4.7.x or older. */
+ uname (&u);
+ if ((sscanf (u.release, "%d.%d", &major, &minor) == 2))
+ {
+ /* Certain required ptrace features were introduced in kernel
+ 3.5. */
+ if (major < 3 || (major == 3 && minor < 5))
+ use_seccomp_p = false;
+ else
+ {
+ if (major < 4 || (major == 4 && minor <= 7))
+ kernel_4_7_or_earlier = true;
+ }
+ }
+#endif /* HAVE_SECCOMP */
}
diff --git a/java/Makefile.in b/java/Makefile.in
index 465f99162ec..3d5165d3186 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -57,7 +57,6 @@ else
GZIP_PROG =
endif
-
# Android 4.3 and earlier require Emacs to be signed with a different
# digital signature algorithm.
@@ -77,6 +76,11 @@ else
AAPT_ASSET_ARGS =
endif
+# This will be replaced by `--no-build-details' if details of the build
+# system are not to be recorded in generated packages.
+BUILD_DETAILS = @BUILD_DETAILS@
+GEN_BUILD_DETAILS := $(if $(BUILD_DETAILS),true ||,)
+
SIGN_EMACS = -keystore $(srcdir)/emacs.keystore -storepass \
emacs1 $(JARSIGNER_FLAGS)
SIGN_EMACS_V2 = sign --v2-signing-enabled --ks \
@@ -249,13 +253,13 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES) \
| xargs ${GZIP_PROG} -9n ; \
}
# Produce metadata files providing build information and suchlike.
- $(AM_V_SILENT) \
+ -$(AM_V_SILENT) $(GEN_BUILD_DETAILS) \
{ (cd $(top_srcdir) \
&& git rev-parse HEAD || echo "Unknown") \
&& (git rev-parse --abbrev-ref HEAD \
|| echo "Unknown") } 2> /dev/null > \
install_temp/assets/version
- $(AM_V_SILENT) \
+ -$(AM_V_SILENT) $(GEN_BUILD_DETAILS) \
{ hostname; date +%s; } > install_temp/assets/build_info
# Produce the file index.
$(AM_V_SILENT) $(libsrc)/asset-directory-tool \
diff --git a/java/org/gnu/emacs/EmacsActivity.java b/java/org/gnu/emacs/EmacsActivity.java
index 7d02e4f4834..0c9e8312b90 100644
--- a/java/org/gnu/emacs/EmacsActivity.java
+++ b/java/org/gnu/emacs/EmacsActivity.java
@@ -78,7 +78,7 @@ public class EmacsActivity extends Activity
public static EmacsWindow focusedWindow;
/* Whether or not this activity is paused. */
- private boolean isPaused;
+ private boolean isStopped;
/* Whether or not this activity is fullscreen. */
private boolean isFullscreen;
@@ -196,7 +196,7 @@ public class EmacsActivity extends Activity
window.view.requestFocus ();
/* If the activity is iconified, send that to the window. */
- if (isPaused)
+ if (isStopped)
window.noticeIconified ();
/* Invalidate the focus. Since attachWindow may be called from
@@ -308,8 +308,13 @@ public class EmacsActivity extends Activity
public final void
onStop ()
{
- timeOfLastInteraction = SystemClock.elapsedRealtime ();
+ /* Iconification was previously reported in onPause, but that was
+ misinformed, as `onStop' is the actual callback activated upon
+ changes in an activity's visibility. */
+ isStopped = true;
+ EmacsWindowManager.MANAGER.noticeIconified (this);
+ timeOfLastInteraction = SystemClock.elapsedRealtime ();
super.onStop ();
}
@@ -403,21 +408,11 @@ public class EmacsActivity extends Activity
invalidateFocus (3);
}
- @Override
- public final void
- onPause ()
- {
- isPaused = true;
-
- EmacsWindowManager.MANAGER.noticeIconified (this);
- super.onPause ();
- }
-
@Override
public final void
onResume ()
{
- isPaused = false;
+ isStopped = false;
timeOfLastInteraction = 0;
EmacsWindowManager.MANAGER.noticeDeiconified (this);
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 82792c3fcca..1c06d394817 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -267,13 +267,6 @@ public final class EmacsView extends ViewGroup
return canvas;
}
- public synchronized void
- prepareForLayout (int wantedWidth, int wantedHeight)
- {
- measuredWidth = wantedWidth;
- measuredHeight = wantedWidth;
- }
-
@Override
protected void
onMeasure (int widthMeasureSpec, int heightMeasureSpec)
@@ -773,23 +766,30 @@ public final class EmacsView extends ViewGroup
/* Collect the bitmap storage; it could be large. */
Runtime.getRuntime ().gc ();
-
super.onDetachedFromWindow ();
}
@Override
- public synchronized void
+ public void
onAttachedToWindow ()
{
- isAttachedToWindow = true;
+ synchronized (this)
+ {
+ isAttachedToWindow = true;
- /* Dirty the bitmap, as it was destroyed when onDetachedFromWindow
- was called. */
- bitmapDirty = true;
+ /* Dirty the bitmap, as it was destroyed when
+ onDetachedFromWindow was called. */
+ bitmapDirty = true;
- /* Now expose the view contents again. */
- EmacsNative.sendExpose (this.window.handle, 0, 0,
- measuredWidth, measuredHeight);
+ /* Rather than unconditionally generating an exposure event upon
+ window attachment, avoid delivering successive Exposure
+ events if the size of the window has changed but is still to
+ be reported by clearing the measured width and height, and
+ requesting another layout computation. */
+ measuredWidth = measuredHeight = 0;
+ }
+
+ requestLayout ();
super.onAttachedToWindow ();
}
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index 342190113b7..218c5639c89 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -74,6 +74,9 @@ public final class EmacsWindow extends EmacsHandleObject
{
private static final String TAG = "EmacsWindow";
+ /* Whether any windows have yet been created in this session. */
+ private static boolean initialWindowCreated;
+
private static class Coordinate
{
/* Integral coordinate. */
@@ -192,6 +195,14 @@ public final class EmacsWindow extends EmacsHandleObject
this.parent = parent;
this.overrideRedirect = overrideRedirect;
+ /* The initial frame should always be bound to the startup
+ activity. */
+ if (!initialWindowCreated)
+ {
+ this.attachmentToken = -1;
+ initialWindowCreated = true;
+ }
+
/* Create the list of children. */
children = new ArrayList ();
@@ -492,7 +503,6 @@ public final class EmacsWindow extends EmacsHandleObject
/* Attach the view. */
try
{
- view.prepareForLayout (width, height);
windowManager.addView (view, params);
/* Record the window manager being used in the
@@ -517,11 +527,6 @@ public final class EmacsWindow extends EmacsHandleObject
public void
run ()
{
- /* Prior to mapping the view, set its measuredWidth and
- measuredHeight to some reasonable value, in order to
- avoid excessive bitmap dirtying. */
-
- view.prepareForLayout (width, height);
view.setVisibility (View.VISIBLE);
if (!getDontFocusOnMap ())
diff --git a/java/org/gnu/emacs/EmacsWindowManager.java b/java/org/gnu/emacs/EmacsWindowManager.java
index 03487e853fb..e4bd995f15a 100644
--- a/java/org/gnu/emacs/EmacsWindowManager.java
+++ b/java/org/gnu/emacs/EmacsWindowManager.java
@@ -174,6 +174,27 @@ public final class EmacsWindowManager
}
}
+ /* Do not create a multitasking activity for the initial frame,
+ but arrange to start EmacsActivity. */
+ if (window.attachmentToken == -1)
+ {
+ intent = new Intent (EmacsService.SERVICE,
+ EmacsActivity.class);
+ intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK);
+
+ try
+ {
+ EmacsService.SERVICE.startActivity (intent);
+ }
+ catch (Exception e)
+ {
+ Log.w (TAG, "an activity could not be started on behalf"
+ + " of the mapped default window " + window.handle);
+ }
+
+ return;
+ }
+
intent = new Intent (EmacsService.SERVICE,
EmacsMultitaskActivity.class);
@@ -205,14 +226,22 @@ public final class EmacsWindowManager
window.attachmentToken = token;
intent.putExtra (ACTIVITY_TOKEN, token);
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
- EmacsService.SERVICE.startActivity (intent);
- else
+ try
{
- /* Specify the desired window size. */
- options = ActivityOptions.makeBasic ();
- options.setLaunchBounds (window.getGeometry ());
- EmacsService.SERVICE.startActivity (intent, options.toBundle ());
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
+ EmacsService.SERVICE.startActivity (intent);
+ else
+ {
+ /* Specify the desired window size. */
+ options = ActivityOptions.makeBasic ();
+ options.setLaunchBounds (window.getGeometry ());
+ EmacsService.SERVICE.startActivity (intent, options.toBundle ());
+ }
+ }
+ catch (Exception e)
+ {
+ Log.w (TAG, "an activity could not be started on behalf"
+ + " of a mapped window, " + window.handle);
}
pruneWindows ();
diff --git a/java/res/drawable/emacs_background.xml b/java/res/drawable/emacs_background.xml
index 448ca48d1cb..c6b6decc3b0 100644
--- a/java/res/drawable/emacs_background.xml
+++ b/java/res/drawable/emacs_background.xml
@@ -21,22 +21,26 @@ along with GNU Emacs. If not, see . -->
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
- android:viewportWidth="512"
- android:viewportHeight="512">
-
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+
-
+
![](\"file://%s\")
slice-count 1)))))))))
+ (should (equal image-zooms '(original))))))))))
(require 'shr)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 08a3dd179e2..8074bed7a47 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -330,6 +330,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/method:1.2.3.4:"))
(should (tramp-tramp-file-p "/method:user@1.2.3.4:"))
+ ;; Using an IPv4 address with port.
+ (should (tramp-tramp-file-p "/method:1.2.3.4#1234:"))
+ (should (tramp-tramp-file-p "/method:user@1.2.3.4#1234:"))
+
;; Using an IPv6 address.
(should (tramp-tramp-file-p "/method:[::1]:"))
(should (tramp-tramp-file-p "/method:user@[::1]:"))
@@ -338,6 +342,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/method:[::ffff:1.2.3.4]:"))
(should (tramp-tramp-file-p "/method:user@[::ffff:1.2.3.4]:"))
+ ;; Using an IPv6 address with port.
+ (should (tramp-tramp-file-p "/method:[::1]#1234:"))
+ (should (tramp-tramp-file-p "/method:user@[::1]#1234:"))
+
;; Local file name part.
(should (tramp-tramp-file-p "/method:::"))
(should (tramp-tramp-file-p "/method::/:"))
@@ -418,6 +426,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/1.2.3.4:"))
(should (tramp-tramp-file-p "/user@1.2.3.4:"))
+ ;; Using an IPv4 address with port.
+ (should (tramp-tramp-file-p "/1.2.3.4#1234:"))
+ (should (tramp-tramp-file-p "/user@1.2.3.4#1234:"))
+
;; Using an IPv6 address.
(should (tramp-tramp-file-p "/[::1]:"))
(should (tramp-tramp-file-p "/user@[::1]:"))
@@ -426,6 +438,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/[::ffff:1.2.3.4]:"))
(should (tramp-tramp-file-p "/user@[::ffff:1.2.3.4]:"))
+ ;; Using an IPv6 address with port.
+ (should (tramp-tramp-file-p "/[::1]#1234:"))
+ (should (tramp-tramp-file-p "/user@[::1]#1234:"))
+
;; Local file name part.
(should (tramp-tramp-file-p "/host::"))
(should (tramp-tramp-file-p "/host:/:"))
@@ -472,6 +488,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/[method/1.2.3.4]"))
(should (tramp-tramp-file-p "/[method/user@1.2.3.4]"))
+ ;; Using an IPv4 address with port.
+ (should (tramp-tramp-file-p "/[method/1.2.3.4#1234]"))
+ (should (tramp-tramp-file-p "/[method/user@1.2.3.4#1234]"))
+
;; Using an IPv6 address.
(should (tramp-tramp-file-p "/[method/::1]"))
(should (tramp-tramp-file-p "/[method/user@::1]"))
@@ -480,6 +500,10 @@ is greater than 10.
(should (tramp-tramp-file-p "/[method/::ffff:1.2.3.4]"))
(should (tramp-tramp-file-p "/[method/user@::ffff:1.2.3.4]"))
+ ;; Using an IPv6 address with port.
+ (should (tramp-tramp-file-p "/[method/::1#1234]"))
+ (should (tramp-tramp-file-p "/[method/user@::1#1234]"))
+
;; Local file name part.
(should (tramp-tramp-file-p "/[method/]"))
(should (tramp-tramp-file-p "/[method/]/:"))
@@ -3904,12 +3928,44 @@ The test is derived from TEST and COMMAND."
(funcall (ert-test-body ert-test)))
(ert-skip (format "Test `%s' must run before" ',test)))))
+(defmacro tramp--test-deftest-without-file-attributes (test)
+ "Define ert `TEST-without-file-attributes'."
+ (declare (indent 1))
+ `(ert-deftest
+ ,(intern (concat (symbol-name test) "-without-file-attributes")) ()
+ :tags '(:expensive-test)
+ (let ((test-doc
+ (split-string
+ (ert-test-documentation (get ',test 'ert--test)) "\n")))
+ ;; The first line must be extended.
+ (setcar
+ test-doc
+ (format "%s Don't Use the \"file-attributes\" cache." (car test-doc)))
+ (setf (ert-test-documentation
+ (get
+ (intern (format "%s-without-file-attributes" ',test))
+ 'ert--test))
+ (string-join test-doc "\n")))
+ (skip-unless (tramp--test-enabled))
+ (skip-unless
+ (or (tramp--test-adb-p) (tramp--test-sh-p) (tramp--test-sudoedit-p)))
+ (if-let ((default-directory ert-remote-temporary-file-directory)
+ (ert-test (ert-get-test ',test))
+ (result (ert-test-most-recent-result ert-test)))
+ (progn
+ (skip-unless (< (ert-test-result-duration result) 300))
+ (let (tramp-use-file-attributes)
+ (funcall (ert-test-body ert-test))))
+ (ert-skip (format "Test `%s' must run before" ',test)))))
+
(tramp--test-deftest-with-stat tramp-test18-file-attributes)
(tramp--test-deftest-with-perl tramp-test18-file-attributes)
(tramp--test-deftest-with-ls tramp-test18-file-attributes)
+(tramp--test-deftest-without-file-attributes tramp-test18-file-attributes)
+
(defvar tramp--test-start-time nil
"Keep the start time of the current test, a float number.")
@@ -4034,6 +4090,9 @@ They might differ only in time attributes or directory size."
(tramp--test-deftest-with-ls tramp-test19-directory-files-and-attributes)
+(tramp--test-deftest-without-file-attributes
+ tramp-test19-directory-files-and-attributes)
+
(ert-deftest tramp-test20-file-modes ()
"Check `file-modes'.
This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
@@ -6839,7 +6898,8 @@ INPUT, if non-nil, is a string sent to the process."
(set-visited-file-name tmp-name1)
(insert "foo")
(should (buffer-modified-p))
- (tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
+ (tramp-cleanup-connection
+ tramp-test-vec 'keep-debug 'keep-password)
(cl-letf (((symbol-function #'read-from-minibuffer)
(lambda (&rest _args) "yes")))
(kill-buffer)))
@@ -7561,6 +7621,8 @@ This requires restrictions of file name syntax."
(tramp--test-deftest-with-ls tramp-test41-special-characters)
+(tramp--test-deftest-without-file-attributes tramp-test41-special-characters)
+
(ert-deftest tramp-test42-utf8 ()
"Check UTF8 encoding in file names and file contents."
(skip-unless (tramp--test-enabled))
@@ -7627,6 +7689,8 @@ This requires restrictions of file name syntax."
(tramp--test-deftest-with-ls tramp-test42-utf8)
+(tramp--test-deftest-without-file-attributes tramp-test42-utf8)
+
(ert-deftest tramp-test43-file-system-info ()
"Check that `file-system-info' returns proper values."
(skip-unless (tramp--test-enabled))
@@ -7864,10 +7928,12 @@ process sentinels. They shall not disturb each other."
(should-not (file-attributes file))
(should (file-attributes file)))
;; Send string to process.
- (process-send-string proc (format "%s\n" (buffer-name buf)))
+ (process-send-string
+ proc (format "%s\n" (buffer-name buf)))
(while (accept-process-output nil 0))
(tramp--test-message
- "Continue action %d %s %s" count buf (current-time-string))
+ "Continue action %d %s %s"
+ count buf (current-time-string))
;; Regular operation post process action.
(dired-uncache file)
(if (= count 2)
diff --git a/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl b/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl
index 8d2f6397e9d..4c59ad6249a 100644
--- a/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl
+++ b/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl
@@ -8,7 +8,7 @@ print $string_with_strange_delimiters;
$printed = 1;
# With cperl-extra-delimiters-mode=on the previous lines are a label
-# and a a print statement. This line here is a comment. Without
+# and a print statement. This line here is a comment. Without
# cperl-extra-delimiters-mode, all this is part of the variable
# declaration.
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 21dbb0711d2..93bc9028031 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -174,7 +174,8 @@ SEVERITY-PREDICATE is used to setup
(flymake-tests--with-flymake
("some-problems.h")
(flymake-goto-next-error)
- (should (eq 'flymake-warning (face-at-point)))
+ ;; implicit-int was promoted from warning to error in GCC 14
+ (should (memq (face-at-point) '(flymake-warning flymake-error)))
(flymake-goto-next-error)
(should (eq 'flymake-error (face-at-point)))
(should-error (flymake-goto-next-error nil nil t)))
diff --git a/test/lisp/ses-tests.el b/test/lisp/ses-tests.el
index a916aed9eb3..3ca1297f5ec 100644
--- a/test/lisp/ses-tests.el
+++ b/test/lisp/ses-tests.el
@@ -201,7 +201,7 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to
(ert-deftest ses-jump-B2-lowcase ()
- "Test jumping to cell B2 by use of lowcase cell name string"
+ "Test jumping to cell B2 by use of lowercase cell name string"
(let ((ses-initial-size '(3 . 3))
ses-after-entry-functions)
(with-temp-buffer
@@ -211,7 +211,7 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to
(should (eq (ses--cell-at-pos (point)) 'B2)))))
(ert-deftest ses-jump-B2-lowcase-keys ()
- "Test jumping to cell B2 by use of lowcase cell name string with simulating keys"
+ "Test jumping to cell B2 by use of lowercase cell name string with simulating keys"
(let ((ses-initial-size '(3 . 3))
ses-after-entry-functions)
(with-temp-buffer
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index afd75786804..d94fa4a583d 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -22,6 +22,7 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(eval-when-compile (require 'cl-lib))
(defun simple-test--buffer-substrings ()
@@ -40,6 +41,49 @@
,@body
(with-no-warnings (simple-test--buffer-substrings))))
+(defconst simple-test-point-tag "")
+(defconst simple-test-mark-tag "")
+
+(defun simple-test--set-buffer-text-point-mark (description)
+ "Set the current buffer's text, point and mark according to
+DESCRIPTION.
+
+Erase current buffer and insert DESCRIPTION. Set point to the
+first occurrence of `simple-test-point-tag' (\"\") in the
+buffer, removing it. If there is no `simple-test-point-tag', set
+point to the beginning of the buffer. If there is a
+`simple-test-mark-tag' (\"\"), remove it, and set an active
+mark there."
+ (erase-buffer)
+ (insert description)
+ (goto-char (point-min))
+ (when (search-forward simple-test-mark-tag nil t)
+ (delete-char (- (length simple-test-mark-tag)))
+ (push-mark (point) nil 'activate))
+ (goto-char (point-min))
+ (when (search-forward simple-test-point-tag nil t)
+ (delete-char (- (length simple-test-point-tag)))))
+
+(defun simple-test--get-buffer-text-point-mark ()
+ "Inverse of `simple-test--set-buffer-text-point-mark'."
+ (cond
+ ((not mark-active)
+ (concat (buffer-substring-no-properties (point-min) (point))
+ simple-test-point-tag
+ (buffer-substring-no-properties (point) (point-max))))
+ ((< (mark) (point))
+ (concat (buffer-substring-no-properties (point-min) (mark))
+ simple-test-mark-tag
+ (buffer-substring-no-properties (mark) (point))
+ simple-test-point-tag
+ (buffer-substring-no-properties (point) (point-max))))
+ (t
+ (concat (buffer-substring-no-properties (point-min) (point))
+ simple-test-point-tag
+ (buffer-substring-no-properties (point) (mark))
+ simple-test-mark-tag
+ (buffer-substring-no-properties (mark) (point-max))))))
+
;;; `count-words'
(ert-deftest simple-test-count-words-bug-41761 ()
@@ -82,7 +126,12 @@
(should (equal (execute-extended-command--shorter
"display-line-numbers-mode"
"display-line")
- "di-n")))
+ ;; Depending on the tests performed and their order, we
+ ;; could have loaded Dired, which defines commands
+ ;; starting with "dir".
+ (if (featurep 'dired)
+ "dis-n"
+ "di-n"))))
(ert-deftest simple-execute-extended-command--describe-binding-msg ()
(let ((text-quoting-style 'grave))
@@ -1046,5 +1095,189 @@ See Bug#21722."
(with-zap-to-char-test "abcdeCXYZ" "XYZ"
(zap-to-char 1 ?C 'interactive))))
+
+;;; Tests for `kill-whole-line'
+
+(declare-function org-fold-hide-sublevels "org-fold" (levels))
+(ert-deftest kill-whole-line-invisible ()
+ (cl-flet ((test (kill-whole-line-arg &rest expected-lines)
+ (ert-info ((format "%s" kill-whole-line-arg) :prefix "Subtest: ")
+ (ert-with-test-buffer-selected nil
+ (simple-test--set-buffer-text-point-mark
+ (string-join
+ '("* -2" "hidden"
+ "* -1" "hidden"
+ "* AB" "hidden"
+ "* 1" "hidden"
+ "* 2" "hidden"
+ "")
+ "\n"))
+ (org-mode)
+ (org-fold-hide-sublevels 1)
+ (kill-whole-line kill-whole-line-arg)
+ (should
+ (equal (string-join expected-lines "\n")
+ (simple-test--get-buffer-text-point-mark)))))))
+ (test 0
+ "* -2" "hidden"
+ "* -1" "hidden"
+ ""
+ "* 1" "hidden"
+ "* 2" "hidden"
+ "")
+ (test 1
+ "* -2" "hidden"
+ "* -1" "hidden"
+ "* 1" "hidden"
+ "* 2" "hidden"
+ "")
+ (test 2
+ "* -2" "hidden"
+ "* -1" "hidden"
+ "* 2" "hidden"
+ "")
+ (test 3
+ "* -2" "hidden"
+ "* -1" "hidden"
+ "")
+ (test 9
+ "* -2" "hidden"
+ "* -1" "hidden"
+ "")
+ (test -1
+ "* -2" "hidden"
+ "* -1" "hidden"
+ "* 1" "hidden"
+ "* 2" "hidden"
+ "")
+ (test -2
+ "* -2" "hidden"
+ "* 1" "hidden"
+ "* 2" "hidden"
+ "")
+ (test -3
+ ""
+ "* 1" "hidden"
+ "* 2" "hidden"
+ "")
+ (test -9
+ ""
+ "* 1" "hidden"
+ "* 2" "hidden"
+ "")))
+
+(ert-deftest kill-whole-line-read-only ()
+ (cl-flet
+ ((test (kill-whole-line-arg expected-kill-lines expected-buffer-lines)
+ (ert-info ((format "%s" kill-whole-line-arg) :prefix "Subtest: ")
+ (ert-with-test-buffer-selected nil
+ (simple-test--set-buffer-text-point-mark
+ (string-join '("-2" "-1" "AB" "1" "2" "") "\n"))
+ (read-only-mode 1)
+ (setq last-command #'ignore)
+ (should-error (kill-whole-line kill-whole-line-arg)
+ :type 'buffer-read-only)
+ (should (equal (string-join expected-kill-lines "\n")
+ (car kill-ring)))
+ (should (equal (string-join expected-buffer-lines "\n")
+ (simple-test--get-buffer-text-point-mark)))))))
+ (test 0 '("AB") '("-2" "-1" "AB" "1" "2" ""))
+ (test 1 '("AB" "") '("-2" "-1" "AB" "1" "2" ""))
+ (test 2 '("AB" "1" "") '("-2" "-1" "AB" "1" "2" ""))
+ (test 3 '("AB" "1" "2" "") '("-2" "-1" "AB" "1" "2" ""))
+ (test 9 '("AB" "1" "2" "") '("-2" "-1" "AB" "1" "2" ""))
+ (test -1 '("" "AB") '("-2" "-1" "AB" "1" "2" ""))
+ (test -2 '("" "-1" "AB") '("-2" "-1" "AB" "1" "2" ""))
+ (test -3 '("-2" "-1" "AB") '("-2" "-1" "AB" "1" "2" ""))
+ (test -9 '("-2" "-1" "AB") '("-2" "-1" "AB" "1" "2" ""))))
+
+(ert-deftest kill-whole-line-after-other-kill ()
+ (ert-with-test-buffer-selected nil
+ (simple-test--set-buffer-text-point-mark "AXB")
+ (setq last-command #'ignore)
+ (kill-region (point) (mark))
+ (deactivate-mark 'force)
+ (setq last-command #'kill-region)
+ (kill-whole-line)
+ (should (equal "AXB" (car kill-ring)))
+ (should (equal ""
+ (simple-test--get-buffer-text-point-mark)))))
+
+(ert-deftest kill-whole-line-buffer-boundaries ()
+ (ert-with-test-buffer-selected nil
+ (ert-info ("0" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "")
+ (should-error (kill-whole-line -1)
+ :type 'beginning-of-buffer)
+ (should-error (kill-whole-line 1)
+ :type 'end-of-buffer))
+ (ert-info ("1a" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\n")
+ (should-error (kill-whole-line 1)
+ :type 'end-of-buffer))
+ (ert-info ("1b" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\nA")
+ (setq last-command #'ignore)
+ (kill-whole-line 1)
+ (should (equal "-1\n"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "A" (car kill-ring))))
+ (ert-info ("2" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "\n1")
+ (should-error (kill-whole-line -1)
+ :type 'beginning-of-buffer))
+ (ert-info ("2b" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "A\n1")
+ (setq last-command #'ignore)
+ (kill-whole-line 1)
+ (should (equal "1"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "A\n" (car kill-ring))))))
+
+(ert-deftest kill-whole-line-line-boundaries ()
+ (ert-with-test-buffer-selected nil
+ (ert-info ("1a" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\n\n1\n")
+ (setq last-command #'ignore)
+ (kill-whole-line 1)
+ (should (equal "-1\n1\n"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "\n" (car kill-ring))))
+ (ert-info ("1b" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\n\n1\n")
+ (setq last-command #'ignore)
+ (kill-whole-line -1)
+ (should (equal "-1\n1\n"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "\n" (car kill-ring))))
+ (ert-info ("2a" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\nA\n1\n")
+ (setq last-command #'ignore)
+ (kill-whole-line 1)
+ (should (equal "-1\n1\n"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "A\n" (car kill-ring))))
+ (ert-info ("2b" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\nA\n1\n")
+ (setq last-command #'ignore)
+ (kill-whole-line -1)
+ (should (equal "-1\n1\n"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "\nA" (car kill-ring))))
+ (ert-info ("3a" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\nA\n1\n")
+ (setq last-command #'ignore)
+ (kill-whole-line 1)
+ (should (equal "-1\n1\n"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "A\n" (car kill-ring))))
+ (ert-info ("3b" :prefix "Subtest: ")
+ (simple-test--set-buffer-text-point-mark "-1\nA\n1\n")
+ (setq last-command #'ignore)
+ (kill-whole-line -1)
+ (should (equal "-1\n1\n"
+ (simple-test--get-buffer-text-point-mark)))
+ (should (equal "\nA" (car kill-ring))))))
+
(provide 'simple-test)
;;; simple-tests.el ends here
diff --git a/test/lisp/which-key-tests.el b/test/lisp/which-key-tests.el
index 1f2b1965ec3..3b42a7bd504 100644
--- a/test/lisp/which-key-tests.el
+++ b/test/lisp/which-key-tests.el
@@ -53,8 +53,7 @@
'(("C-a" . "which-key-test--named-map"))))))
(ert-deftest which-key-test--prefix-declaration ()
- "Test `which-key-declare-prefixes' and
-`which-key-declare-prefixes-for-mode'. See Bug #109."
+ ;; See Bug #109.
(let* ((major-mode 'test-mode)
which-key-replacement-alist)
(which-key-add-key-based-replacements
diff --git a/test/lisp/whitespace-tests.el b/test/lisp/whitespace-tests.el
index 73c7e742ec5..bd35b3ac9f3 100644
--- a/test/lisp/whitespace-tests.el
+++ b/test/lisp/whitespace-tests.el
@@ -8,7 +8,6 @@
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -94,6 +93,20 @@ buffer's content."
(should (equal (whitespace-tests--cleanup-string "a \n\t \n\n")
"a \n"))))
+(ert-deftest whitespace-cleanup-missing-newline-at-eof ()
+ (let ((whitespace-style '(empty missing-newline-at-eof)))
+ (should (equal (whitespace-tests--cleanup-string "")
+ ""))
+ (should (equal (whitespace-tests--cleanup-string "a")
+ "a\n"))
+ (should (equal (whitespace-tests--cleanup-string "a\n\t")
+ "a\n"))
+ (should (equal (whitespace-tests--cleanup-string "a\n\t ")
+ "a\n"))
+ (should (equal (whitespace-tests--cleanup-string "a\n\t ")
+ "a\n"))
+ (should (equal (whitespace-tests--cleanup-string "\n\t")
+ ""))))
;; We cannot call whitespace-mode because it will do nothing in batch
;; mode. So we call its innards instead.
diff --git a/test/manual/indent/perl.perl b/test/manual/indent/perl.perl
index b44593da028..de76fffa262 100755
--- a/test/manual/indent/perl.perl
+++ b/test/manual/indent/perl.perl
@@ -5,6 +5,10 @@ sub add_funds($) {
return 0;
}
+find ({ wanted => sub {
+ return;
+ }, follow => 1 }, '/tmp');
+
# qw(...) is a quoted list of words, so we can and should indent its content!
my @tutu = qw[
tata
diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el
index 54f339f6373..084fcd8c9db 100644
--- a/test/src/comp-resources/comp-test-funcs.el
+++ b/test/src/comp-resources/comp-test-funcs.el
@@ -361,7 +361,7 @@
2))
(defun comp-test-copy-insn-f (insn)
- ;; From `comp-copy-insn'.
+ ;; From `comp--copy-insn'.
(if (consp insn)
(let (result)
(while (consp insn)
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index dffb7097a3e..33b127d5d26 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -495,8 +495,7 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html."
(comp-deftest compile-forms ()
"Verify lambda form native compilation."
(should-error (native-compile '(+ 1 foo)))
- (let ((lexical-binding t)
- (f (native-compile '(lambda (x) (1+ x)))))
+ (let ((f (native-compile '(lambda (x) (1+ x)))))
(should (native-comp-function-p f))
(should (= (funcall f 2) 3)))
(let* ((lexical-binding nil)
@@ -504,6 +503,12 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html."
(should (native-comp-function-p f))
(should (= (funcall f 2) 3))))
+(comp-deftest compile-interpreted-functions ()
+ "Verify native compilation of interpreted functions."
+ (let ((f (native-compile (eval '(lambda (x) (1+ x))))))
+ (should (native-comp-function-p f))
+ (should (= (funcall f 2) 3))))
+
(comp-deftest comp-test-defsubst ()
;; Bug#42664, Bug#43280, Bug#44209.
(should-not (native-comp-function-p (symbol-function 'comp-test-defsubst-f))))
@@ -1320,7 +1325,7 @@ Return a list of results."
(5 (message "five")))
x)
't
- ;; FIXME improve `comp-cond-cstrs-target-mvar' to cross block
+ ;; FIXME improve `comp--cond-cstrs-target-mvar' to cross block
;; boundary if necessary as this should return:
;; (or (integer 1 1) (integer 5 5))
)
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index ca5b10db705..decbdb6ac52 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -1606,6 +1606,13 @@
(1.5 . 1.6) (-1.3 . -1.2) (-13.0 . 12.0)
;; floats/fixnums
(1 . 1.1) (1.9 . 2) (-2.0 . 1) (-2 . 1.0)
+ ;; fixnums that can't be represented as floats
+ (72057594037927935 . 72057594037927936.0)
+ (72057594037927936.0 . 72057594037927937)
+ (-72057594037927936.0 . -72057594037927935)
+ (-72057594037927937 . -72057594037927936.0)
+ (2305843009213693951 . 2305843009213693952.0)
+
;; floats/bignums
(,big . ,(float (* 2 big))) (,(float big) . ,(* 2 big))
;; symbols
@@ -1665,7 +1672,11 @@
(should (value< x y))
(should-not (value< y x))
(should-not (value< x x))
- (should-not (value< y y))))
+ (should-not (value< y y))
+ (should (value< (vector x 2) (vector y 1)))
+ (should-not (value< (vector y 1) (vector x 2)))
+ (should (value< (vector x 1) (vector x 2)))
+ (should (value< (vector y 1) (vector y 2)))))
(delete-process proc2)
(delete-process proc1)
@@ -1683,6 +1694,9 @@
;; numbers
(0 . 0.0) (0 . -0.0) (0.0 . -0.0)
+ (72057594037927936 . 72057594037927936.0)
+ (1 . 0.0e+NaN)
+
;; symbols
(a . #:a)
@@ -1697,7 +1711,9 @@
(let ((x (car c))
(y (cdr c)))
(should-not (value< x y))
- (should-not (value< y x))))))
+ (should-not (value< y x))
+ (should (value< (cons x 1) (cons y 2)))
+ (should-not (value< (cons x 2) (cons y 1)))))))
(ert-deftest fns-value<-type-mismatch ()
;; values of disjoint (incomparable) types
diff --git a/test/src/image-tests.el b/test/src/image-tests.el
index 24e60fb100f..e321b80e7a8 100644
--- a/test/src/image-tests.el
+++ b/test/src/image-tests.el
@@ -49,11 +49,11 @@
(ert-deftest image-tests-image-mask-p/error-on-nongraphical-display ()
(skip-when (display-images-p))
- (should-error (image-mask-p (cdr (assq 'xpm image-tests--images)))))
+ (should-error (image-mask-p (cdr (assq 'xbm image-tests--images)))))
(ert-deftest image-tests-image-metadata/error-on-nongraphical-display ()
(skip-when (display-images-p))
- (should-error (image-metadata (cdr (assq 'xpm image-tests--images)))))
+ (should-error (image-metadata (cdr (assq 'xbm image-tests--images)))))
(ert-deftest image-tests-imagemagick-types ()
(skip-unless (fboundp 'imagemagick-types))
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index ce5dc76794a..3431ba5f4dd 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -842,6 +842,7 @@ visible_end.)"
'missing))
(goto-char (point-max))
(insert "]")
+ (treesit-parser-root-node parser)
(should (treesit-node-check array-node 'outdated))))
;;; Defun navigation