From e032cde91fac488ca5ac5c221c0de19b60cb31ad Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 1 Sep 2024 11:20:25 +0100 Subject: [PATCH] ; Reword some "allows Xing" * doc/emacs/anti.texi (Antinews): * etc/NEWS: * etc/NEWS.29: * lisp/tab-bar.el (tab-bar-select-restore-windows): * lisp/vc/vc-git.el (vc-git-print-log-follow): Reword to avoid "allows Xing". This is reported to be better for non-native readers. Based on suggestions of Eli Zaretskii . (cherry picked from commit da980ad838e404460da8e284a62a35395833a96c) --- doc/emacs/anti.texi | 2 +- etc/NEWS.29 | 10 +++++----- lisp/tab-bar.el | 4 ++-- lisp/vc/vc-git.el | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index 97110dc8cdb..f64dd104f60 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} is now gone. @item -The command @code{recover-file} no longer allows displaying the diffs +The command @code{recover-file} no longer lets you 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 diff --git a/etc/NEWS.29 b/etc/NEWS.29 index 13a78c67500..d6a526e3735 100644 --- a/etc/NEWS.29 +++ b/etc/NEWS.29 @@ -2031,7 +2031,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 committing only some of the changes. +*** 'C-x v v' in a diffs buffer lets you commit 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' @@ -3528,8 +3528,8 @@ 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 modifying the settings of an existing -connection-local profile. +You can use this to modify the settings of an existing connection-local +profile. *** New macro 'with-connection-local-application-variables'. This macro works like 'with-connection-local-variables', but it allows @@ -4045,8 +4045,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 starting the measurement -of text from a specified amount of pixels above or below a position. +The FROM argument can now be a cons, which means to start measuring text +from a specified number 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 diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 3848558a111..f8c49f5598a 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el @@ -1517,8 +1517,8 @@ 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 restoring the killed buffer, -if it was visiting a file." +There is a button in the window which you can press to restore the +killed buffer, if that buffer was visiting a file." (dolist (quad windows) (when (window-live-p (nth 0 quad)) (let* ((window (nth 0 quad)) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 3ae08a59105..76388211545 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1459,9 +1459,9 @@ the file renames. The downsides is that the log produced this 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 showing the log for the -file name before the rename." +When this variable is nil, and the log ends with a rename, there is a +button which you can press to show the log for the file name before the +rename." :type 'boolean :version "26.1") -- 2.39.5