aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2024-08-30 20:33:11 +0300
committerEli Zaretskii2024-08-30 20:33:11 +0300
commit62dcbfb776f7dce2da3de3d5cd31da7360316ded (patch)
tree7c6927bfcee02ebe53ef574e01fd7ad210810208
parentdfcfaa0ef58bab0df243ebf816293a124f4c91c9 (diff)
parent1baa62b2ac12ac4dcdace079fabd4c21d10e3e6e (diff)
downloademacs-62dcbfb776f7dce2da3de3d5cd31da7360316ded.tar.gz
emacs-62dcbfb776f7dce2da3de3d5cd31da7360316ded.zip
Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30
-rw-r--r--doc/emacs/anti.texi2
-rw-r--r--etc/NEWS4
-rw-r--r--etc/NEWS.298
-rw-r--r--lib/cdefs.h2
-rw-r--r--lisp/tab-bar.el2
-rw-r--r--lisp/vc/vc-git.el2
-rw-r--r--m4/gnulib-common.m44
7 files changed, 12 insertions, 12 deletions
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index bf355ff1fea..97110dc8cdb 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -71,7 +71,7 @@ tool bars on the bottom. For the same reasons @code{modifier-bar-mode}
71is now gone. 71is now gone.
72 72
73@item 73@item
74The command @code{recover-file} no longer allows to display the diffs 74The command @code{recover-file} no longer allows displaying the diffs
75between a file and its auto-save file. You either want to recover a 75between a file and its auto-save file. You either want to recover a
76file or you don't; confusing users with a third alternative when they 76file or you don't; confusing users with a third alternative when they
77are anxious already by the possibility of losing precious edits is 77are anxious already by the possibility of losing precious edits is
diff --git a/etc/NEWS b/etc/NEWS
index 9cf41188868..0766900a495 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1021,7 +1021,7 @@ It allows tweaking the thresholds for rename and copy detection.
1021*** VC Directory buffers now display the upstream branch in Git repositories. 1021*** VC Directory buffers now display the upstream branch in Git repositories.
1022The "upstream branch" is the branch from which 'vc-pull' fetches changes 1022The "upstream branch" is the branch from which 'vc-pull' fetches changes
1023by default. In Git terms, the upstream branch of branch B is determined 1023by default. In Git terms, the upstream branch of branch B is determined
1024by configuration variables branch.B.remote and branch.B.merge. 1024by configuration variables 'branch.B.remote' and 'branch.B.merge'.
1025 1025
1026When these configuration variables are set for the current branch, the 1026When these configuration variables are set for the current branch, the
1027VC Directory buffer will show the corresponding upstream branch under 1027VC Directory buffer will show the corresponding upstream branch under
@@ -1102,7 +1102,7 @@ in size.
1102 1102
1103+++ 1103+++
1104*** 'dired-listing-switches' handles connection-local values if exist. 1104*** 'dired-listing-switches' handles connection-local values if exist.
1105This allows to customize different switches for different remote machines. 1105This allows customizing different switches for different remote machines.
1106 1106
1107** Ediff 1107** Ediff
1108 1108
diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 1e381034ada..bd893c04446 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -2032,7 +2032,7 @@ The intention is that this command can be used to access a wide
2032variety of version control system-specific functionality from VC 2032variety of version control system-specific functionality from VC
2033without complexifying either the VC command set or the backend API. 2033without complexifying either the VC command set or the backend API.
2034 2034
2035*** 'C-x v v' in a diffs buffer allows to commit only some of the changes. 2035*** 'C-x v v' in a diffs buffer allows committing only some of the changes.
2036This command is intended to allow you to commit only some of the 2036This command is intended to allow you to commit only some of the
2037changes you have in your working tree. Begin by creating a buffer 2037changes you have in your working tree. Begin by creating a buffer
2038with the changes against the last commit, e.g. with 'C-x v D' 2038with the changes against the last commit, e.g. with 'C-x v D'
@@ -3529,7 +3529,7 @@ The variables 'connection-local-profile-alist' and
3529make it more convenient to inspect and modify them. 3529make it more convenient to inspect and modify them.
3530 3530
3531*** New function 'connection-local-update-profile-variables'. 3531*** New function 'connection-local-update-profile-variables'.
3532This function allows to modify the settings of an existing 3532This function allows modifying the settings of an existing
3533connection-local profile. 3533connection-local profile.
3534 3534
3535*** New macro 'with-connection-local-application-variables'. 3535*** New macro 'with-connection-local-application-variables'.
@@ -4046,8 +4046,8 @@ measured will be counted for the purpose of calculating the text
4046dimensions. 4046dimensions.
4047 4047
4048** 'window-text-pixel-size' understands a new meaning of FROM. 4048** 'window-text-pixel-size' understands a new meaning of FROM.
4049Specifying a cons as the FROM argument allows to start measuring text 4049Specifying a cons as the FROM argument allows starting the measurement
4050from a specified amount of pixels above or below a position. 4050of text from a specified amount of pixels above or below a position.
4051 4051
4052** 'window-body-width' and 'window-body-height' can use remapped faces. 4052** 'window-body-width' and 'window-body-height' can use remapped faces.
4053Specifying 'remap' as the PIXELWISE argument now checks if the default 4053Specifying 'remap' as the PIXELWISE argument now checks if the default
diff --git a/lib/cdefs.h b/lib/cdefs.h
index d38382ad9d8..02fcabce722 100644
--- a/lib/cdefs.h
+++ b/lib/cdefs.h
@@ -497,7 +497,7 @@
497# endif 497# endif
498#endif 498#endif
499 499
500/* ISO C99 also allows to declare arrays as non-overlapping. The syntax is 500/* ISO C99 also allows declaring arrays as non-overlapping. The syntax is
501 array_name[restrict] 501 array_name[restrict]
502 GCC 3.1 and clang support this. 502 GCC 3.1 and clang support this.
503 This syntax is not usable in C++ mode. */ 503 This syntax is not usable in C++ mode. */
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 60d5bbf169b..363c98d8337 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1478,7 +1478,7 @@ in the same window to give information about the killed buffer."
1478 1478
1479(defun tab-bar-select-restore-windows (_frame windows _type) 1479(defun tab-bar-select-restore-windows (_frame windows _type)
1480 "Display a placeholder buffer in the window whose buffer was killed. 1480 "Display a placeholder buffer in the window whose buffer was killed.
1481A button in the window allows to restore the killed buffer, 1481A button in the window allows restoring the killed buffer,
1482if it was visiting a file." 1482if it was visiting a file."
1483 (dolist (quad windows) 1483 (dolist (quad windows)
1484 (when (window-live-p (nth 0 quad)) 1484 (when (window-live-p (nth 0 quad))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index e8257c5dbd0..4006623799b 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1453,7 +1453,7 @@ way may omit certain (merge) commits, and that `log-view-diff'
1453fails on commits that used the previous name, in that log buffer. 1453fails on commits that used the previous name, in that log buffer.
1454 1454
1455When this variable is nil, and the log ends with a rename, we 1455When this variable is nil, and the log ends with a rename, we
1456show a button below that which allows to show the log for the 1456show a button below that which allows showing the log for the
1457file name before the rename." 1457file name before the rename."
1458 :type 'boolean 1458 :type 'boolean
1459 :version "26.1") 1459 :version "26.1")
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index b34b4534bfe..06dd6029759 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1364,7 +1364,7 @@ dnl
1364dnl This macro sets two variables: 1364dnl This macro sets two variables:
1365dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version" 1365dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version"
1366dnl - ac_cv_func_<func> to yes / no / no 1366dnl - ac_cv_func_<func> to yes / no / no
1367dnl The first variable allows to distinguish all three cases. 1367dnl The first variable allows distinguishing all three cases.
1368dnl The second variable is set, so that an invocation 1368dnl The second variable is set, so that an invocation
1369dnl gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]]) 1369dnl gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]])
1370dnl can be used as a drop-in replacement for 1370dnl can be used as a drop-in replacement for
@@ -1417,7 +1417,7 @@ dnl
1417dnl This macro sets two variables: 1417dnl This macro sets two variables:
1418dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version" 1418dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version"
1419dnl - ac_cv_func_<func> to yes / no / no 1419dnl - ac_cv_func_<func> to yes / no / no
1420dnl The first variable allows to distinguish all three cases. 1420dnl The first variable allows distinguishing all three cases.
1421dnl The second variable is set, so that an invocation 1421dnl The second variable is set, so that an invocation
1422dnl gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]]) 1422dnl gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]])
1423dnl can be used as a drop-in replacement for 1423dnl can be used as a drop-in replacement for