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

Merge from origin/emacs-30

Browse source 
4b60267d83 Make Python skeletons available in 'python-ts-mode' as well
62dcbfb776 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
1baa62b2ac ; * etc/NEWS: Fix typos.
dfcfaa0ef5 More accurate documentation of 'equal' in ELisp Reference
baaf97ce1a ; Fix some ungrammatical uses of "allows to"

# Conflicts:
#	etc/NEWS
This commit is contained in:
Eli Zaretskii 2024-08-31 08:14:13 -04:00
commit d1f896b5f8
9 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/emacs/anti.texi
View file

@ -71,7 +71,7 @@ tool bars on the bottom. For the same reasons @code{modifier-bar-mode}
is now gone.
@item
The command @code{recover-file} no longer allows to display the diffs
The command @code{recover-file} no longer allows displaying 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

9
doc/lispref/objects.texi
View file

@ -2413,6 +2413,11 @@ the converse is not always true.
@end group
@end example
The @code{equal} function recursively compares the contents of objects
if they are integers, strings, markers, lists, cons cells, vectors,
bool-vectors, byte-code function objects, char-tables, records, or font
objects.
Comparison of strings is case-sensitive, but does not take account of
text properties---it compares only the characters in the strings.
@xref{Text Properties}. Use @code{equal-including-properties} to also
@ -2428,10 +2433,6 @@ same sequence of character codes and all these codes are in the range
@end group
@end example
The @code{equal} function recursively compares the contents of objects
if they are integers, strings, markers, vectors, bool-vectors,
byte-code function objects, char-tables, records, or font objects.
If @var{object1} or @var{object2} contains symbols with position,
@code{equal} treats them as if they were their bare symbols when
@code{symbols-with-pos-enabled} is non-@code{nil}. Otherwise

8
etc/NEWS.29
View file

@ -2032,7 +2032,7 @@ The intention is that this command can be used to access a wide
variety of version control system-specific functionality from VC
without complexifying either the VC command set or the backend API.
*** 'C-x v v' in a diffs buffer allows to commit only some of the changes.
*** 'C-x v v' in a diffs buffer allows committing only some of the changes.
This command is intended to allow you to commit only some of the
changes you have in your working tree. Begin by creating a buffer
with the changes against the last commit, e.g. with 'C-x v D'
@ -3529,7 +3529,7 @@ The variables 'connection-local-profile-alist' and
make it more convenient to inspect and modify them.
*** New function 'connection-local-update-profile-variables'.
This function allows to modify the settings of an existing
This function allows modifying the settings of an existing
connection-local profile.
*** New macro 'with-connection-local-application-variables'.
@ -4046,8 +4046,8 @@ measured will be counted for the purpose of calculating the text
dimensions.
** 'window-text-pixel-size' understands a new meaning of FROM.
Specifying a cons as the FROM argument allows to start measuring text
from a specified amount of pixels above or below a position.
Specifying a cons as the FROM argument allows starting the measurement
of text from a specified amount of pixels above or below a position.
** 'window-body-width' and 'window-body-height' can use remapped faces.
Specifying 'remap' as the PIXELWISE argument now checks if the default

4
etc/NEWS.30
View file

@ -1021,7 +1021,7 @@ It allows tweaking the thresholds for rename and copy detection.
*** VC Directory buffers now display the upstream branch in Git repositories.
The "upstream branch" is the branch from which 'vc-pull' fetches changes
by default. In Git terms, the upstream branch of branch B is determined
by configuration variables branch.B.remote and branch.B.merge.
by configuration variables 'branch.B.remote' and 'branch.B.merge'.
When these configuration variables are set for the current branch, the
VC Directory buffer will show the corresponding upstream branch under
@ -1102,7 +1102,7 @@ in size.
+++
*** 'dired-listing-switches' handles connection-local values if exist.
This allows to customize different switches for different remote machines.
This allows customizing different switches for different remote machines.
** Ediff

2
lib/cdefs.h
View file

@ -497,7 +497,7 @@
# endif
#endif
/* ISO C99 also allows to declare arrays as non-overlapping. The syntax is
/* ISO C99 also allows declaring arrays as non-overlapping. The syntax is
array_name[restrict]
GCC 3.1 and clang support this.
This syntax is not usable in C++ mode. */

4
lisp/progmodes/python.el
View file

@ -5390,8 +5390,8 @@ be added to `python-mode-skeleton-abbrev-table'."
(format "Insert %s statement." name))
,@skel))))
(define-abbrev-table 'python-mode-abbrev-table ()
"Abbrev table for Python mode."
(define-abbrev-table 'python-base-mode-abbrev-table ()
"Abbrev table for Python modes."
:parents (list python-mode-skeleton-abbrev-table))
(defmacro python-define-auxiliary-skeleton (name &optional doc &rest skel)

2
lisp/tab-bar.el
View file

@ -1517,7 +1517,7 @@ in the same window to give information about the killed buffer."
(defun tab-bar-select-restore-windows (_frame windows _type)
"Display a placeholder buffer in the window whose buffer was killed.
A button in the window allows to restore the killed buffer,
A button in the window allows restoring the killed buffer,
if it was visiting a file."
(dolist (quad windows)
(when (window-live-p (nth 0 quad))

2
lisp/vc/vc-git.el
View file

@ -1460,7 +1460,7 @@ way may omit certain (merge) commits, and that `log-view-diff'
fails on commits that used the previous name, in that log buffer.
When this variable is nil, and the log ends with a rename, we
show a button below that which allows to show the log for the
show a button below that which allows showing the log for the
file name before the rename."
:type 'boolean
:version "26.1")

4
m4/gnulib-common.m4
View file

@ -1364,7 +1364,7 @@ dnl
dnl This macro sets two variables:
dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version"
dnl - ac_cv_func_<func> to yes / no / no
dnl The first variable allows to distinguish all three cases.
dnl The first variable allows distinguishing all three cases.
dnl The second variable is set, so that an invocation
dnl gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]])
dnl can be used as a drop-in replacement for
@ -1417,7 +1417,7 @@ dnl
dnl This macro sets two variables:
dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version"
dnl - ac_cv_func_<func> to yes / no / no
dnl The first variable allows to distinguish all three cases.
dnl The first variable allows distinguishing all three cases.
dnl The second variable is set, so that an invocation
dnl gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]])
dnl can be used as a drop-in replacement for