[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 93a74773b6: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master 93a74773b6: Merge from origin/emacs-28 |
Date: |
Tue, 10 May 2022 00:54:32 -0400 (EDT) |
branch: master
commit 93a74773b61334905ff174537b63647e495fef95
Merge: 3c5e1f8ec8 7b4bdf7b9b
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
7b4bdf7b9b Remove the AUCTeX subsection from MS-Windows FAQ
d2a5631552 Update AUCTeX FAQ entry
177718bc6d Update string-to-number documentation to bignum Emacs
74cc3b525f Fix doc string references to tags-loop-continue
---
doc/lispref/strings.texi | 4 +---
doc/misc/efaq-w32.texi | 17 -----------------
lisp/vc/vc-dir.el | 4 ++--
3 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 5e41f8d57b..488967088b 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -856,9 +856,7 @@ between 2 and 16 (inclusive), and integers are converted in
that base.
If @var{base} is @code{nil}, then base ten is used. Floating-point
conversion only works in base ten; we have not implemented other
radices for floating-point numbers, because that would be much more
-work and does not seem useful. If @var{string} looks like an integer
-but its value is too large to fit into a Lisp integer,
-@code{string-to-number} returns a floating-point result.
+work and does not seem useful.
The parsing skips spaces and tabs at the beginning of @var{string},
then reads as much of @var{string} as it can interpret as a number in
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 8dcdb121ab..55175a3b89 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -1742,23 +1742,6 @@ You will need an implementation of TeX for Windows.
A number of implementations are listed on the
@uref{http://www.tug.org/interest.html#free, TeX Users Group} website.
-@menu
-* AUCTeX::
-@end menu
-
-@node AUCTeX
-@subsection AUCTeX
-@cindex auctex, precompiled for Windows
-@cindex latex
-@cindex preview-latex
-
-AUCTeX is an Emacs package for writing LaTeX files, which also
-includes preview-latex, an Emacs mode for previewing the formatted
-contents of LaTeX documents. Pre-compiled versions for Windows are
-available from
-@uref{https://www.gnu.org/software/auctex/download-for-windows.html, the
-AUCTeX site}.
-
@node Spell check
@section How do I perform spell checks?
@cindex spell checking
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 2e9de587bf..1545763a3a 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -924,7 +924,7 @@ system."
"Search through all marked files for a match for REGEXP.
For marked directories, use the files displayed from those directories.
Stops when a match is found.
-To continue searching for next match, use command \\[tags-loop-continue]."
+To continue searching for next match, use command \\[fileloop-continue]."
(interactive "sSearch marked files (regexp): ")
(tags-search regexp
(mapcar #'car (vc-dir-marked-only-files-and-states))))
@@ -940,7 +940,7 @@ DEL or `n' to skip and go to the next match. For more
directions,
type \\[help-command] at that time.
If you exit (\\[keyboard-quit], RET or q), you can resume the query replace
-with the command \\[tags-loop-continue]."
+with the command \\[fileloop-continue]."
;; FIXME: this is almost a copy of `dired-do-query-replace-regexp'. This
;; should probably be made generic and used in both places instead of
;; duplicating it here.