[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 32de11d 3/7: ; Remove various duplicated words
From: |
Mattias Engdegård |
Subject: |
master 32de11d 3/7: ; Remove various duplicated words |
Date: |
Sat, 25 Sep 2021 14:30:50 -0400 (EDT) |
branch: master
commit 32de11d8deff2c4df6d3f8a7b0de8d81980a91e4
Author: Mattias Engdegård <mattiase@acm.org>
Commit: Mattias Engdegård <mattiase@acm.org>
; Remove various duplicated words
* doc/lispref/searching.texi (Extending Rx):
* doc/lispref/strings.texi (Creating Strings):
* doc/misc/modus-themes.org (Measure color contrast (DIY)):
* etc/NEWS:
* lisp/find-file.el (ff-find-other-file):
* lisp/gnus/gnus-group.el (gnus-group-suspend):
* lisp/progmodes/cc-langs.el (c-ml-string-any-closer-re):
* lisp/progmodes/flymake.el (flymake-list-only-diagnostics):
* lisp/progmodes/xref.el (xref--group-name-for-display):
* lisp/transient.el (transient-child, transient-files)
(transient-infix-value):
* src/alloc.c:
* src/regex-emacs.c (regex_compile):
Remove duplicate words in comments, documentation etc.
---
doc/lispref/searching.texi | 2 +-
doc/lispref/strings.texi | 2 +-
doc/misc/modus-themes.org | 2 +-
etc/NEWS | 2 +-
lisp/find-file.el | 2 +-
lisp/gnus/gnus-group.el | 2 +-
lisp/progmodes/cc-langs.el | 2 +-
lisp/progmodes/flymake.el | 2 +-
lisp/progmodes/xref.el | 2 +-
lisp/transient.el | 6 +++---
src/alloc.c | 3 +--
src/regex-emacs.c | 4 ++--
12 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 0dcf388..9451d83 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1651,7 +1651,7 @@ package prefix to avoid name clashes with definitions
elsewhere, as is
usual when naming non-local variables and functions.
Forms defined this way only perform simple template substitution.
-For arbitrary computations, use them together with with the @code{rx}
+For arbitrary computations, use them together with the @code{rx}
forms @code{eval}, @code{regexp} or @code{literal}. Example:
@example
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index b4d7bc7..9756e63 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -402,7 +402,7 @@ Remove the trailing text that matches @var{regexp} from
@var{string}.
@defun string-trim string &optional trim-left trim-right
Remove the leading text that matches @var{trim-left} and trailing text
-that matches @var{trim-right} from from @var{string}. Both regexps
+that matches @var{trim-right} from @var{string}. Both regexps
default to @samp{[ \t\n\r]+}.
@end defun
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 5bb230f..6c3692b 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -2700,7 +2700,7 @@ A couple of examples (rounded numbers):
;; Pure black with pure green
(modus-themes-contrast "#000000" "#00ff00")
;; => 15.3
-;; That is is a highly accessible combo
+;; That is a highly accessible combo
#+end_src
It does not matter which color value comes first. The ratio is always
diff --git a/etc/NEWS b/etc/NEWS
index 61780a3..ca167d6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3681,7 +3681,7 @@ used in.
** 'condition-case' now allows for a success handler.
It is written as '(:success BODY...)' where BODY is executed
whenever the protected form terminates without error, with the
-specified variable bound to the the value of the protected form.
+specified variable bound to the value of the protected form.
+++
** New function 'benchmark-call' to measure the execution time of a function.
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 4d520c0..afe6cb5 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -356,7 +356,7 @@ Variables of interest include:
List of functions to be called if the other file has been created."
(interactive (list current-prefix-arg nil last-nonmenu-event))
;; We want to preserve point in the current buffer. But the point of
- ;; ff-find-the-other-file is to make the the other file buffer
+ ;; ff-find-the-other-file is to make the other file buffer
;; current, so we can't use save-excursion here (see bug 48535).
(let ((start-buffer (current-buffer))
(start-point (point)))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 83c9535..aea8cbb 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -4473,7 +4473,7 @@ The hook `gnus-suspend-gnus-hook' is called before
actually suspending."
(gnus-kill-buffer buf)))
(setq gnus-backlog-articles nil)
(gnus-kill-gnus-frames)
- ;; Closing all the backends is useful (for instance) when when the
+ ;; Closing all the backends is useful (for instance) when the
;; IP addresses have changed and you need to reconnect.
(dolist (elem gnus-opened-servers)
(gnus-close-server (car elem)))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 36f1236..53f6206 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -680,7 +680,7 @@ A search for this regexp starting at the end of the
corresponding
opener must find the first closer as the first match.
Such a closer must include a \" character. (match-string 1)
-matches the actual delimiter and and (match-string 2) matches the
+matches the actual delimiter and (match-string 2) matches the
actual \". If a delimiter contains several \"s, it is
recommended to regard the last of them as \"the\" \"."
t nil
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 9418deb..5a1455a 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1654,7 +1654,7 @@ buffer."
"Diagnostics list meant for listing, not highlighting.
This variable holds an alist ((FILE-NAME . DIAGS) ...) where
FILE-NAME is a string holding an absolute file name and DIAGS is
-a list of diagnostic objects created with with
+a list of diagnostic objects created with
`flymake-make-diagnostic'. These diagnostics are never annotated
as overlays in actual buffers: they merely serve as temporary
stand-ins for more accurate diagnostics that are produced once
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index af1413e..8906f63 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1018,7 +1018,7 @@ GROUP is a string for decoration purposes and XREF is an
The style is determined by the value of `xref-file-name-display'.
If GROUP looks like a file name, its value is formatted according
-to that style. Otherwise it it returned unchanged."
+to that style. Otherwise it is returned unchanged."
;; XXX: The way we verify that it's indeed a file name and not some
;; other kind of string, e.g. Java package name or TITLE from
;; `tags-apropos-additional-actions', is pretty lax. But we don't
diff --git a/lisp/transient.el b/lisp/transient.el
index f3d3902..c33a4c7 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -640,7 +640,7 @@ the prototype is stored in the clone's `prototype' slot.")
:initarg :if-not-derived
:initform nil
:documentation "Enable if major-mode does not derive from value."))
- "Abstract superclass for group and and suffix classes.
+ "Abstract superclass for group and suffix classes.
It is undefined what happens if more than one `if*' predicate
slot is non-nil."
@@ -729,7 +729,7 @@ slot is non-nil."
(defclass transient-files (transient-infix) ()
"Class used for the \"--\" argument.
All remaining arguments are treated as files.
-They become the value of this this argument.")
+They become the value of this argument.")
;;;; Group
@@ -2736,7 +2736,7 @@ Usually only infixes have a value, but see the method for
(cl-defmethod transient-infix-value ((_ transient-suffix))
"Return nil, which means \"no value\".
-Infix arguments contribute the the transient's value while suffix
+Infix arguments contribute the transient's value while suffix
commands consume it. This function is called for suffixes anyway
because a command that both contributes to the transient's value
and also consumes it is not completely unconceivable.
diff --git a/src/alloc.c b/src/alloc.c
index 4ea337d..0895a0f 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1929,8 +1929,7 @@ allocate_string_data (struct Lisp_String *s,
The character is at byte offset CIDX_BYTE in the string.
The character being replaced is CLEN bytes long,
and the character that will replace it is NEW_CLEN bytes long.
- Return the address of where the caller should store the
- the new character. */
+ Return the address where the caller should store the new character. */
unsigned char *
resize_string_data (Lisp_Object string, ptrdiff_t cidx_byte,
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 8350e54..3224f65 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -2407,7 +2407,7 @@ regex_compile (re_char *pattern, ptrdiff_t size,
if (lower_bound == 0)
{
- /* A succeed_n that starts with 0 is really a
+ /* A succeed_n that starts with 0 is really
a simple on_failure_jump_loop. */
INSERT_JUMP (on_failure_jump_loop, laststart,
b + 3 + nbytes);
@@ -3828,7 +3828,7 @@ mutually_exclusive_p (struct re_pattern_buffer *bufp,
re_char *p1,
/* Matching routines. */
/* re_match_2 matches the compiled pattern in BUFP against the
- the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
+ (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
and SIZE2, respectively). We start matching at POS, and stop
matching at STOP.
- master updated (80fddff -> e6656df), Mattias Engdegård, 2021/09/25
- master 32de11d 3/7: ; Remove various duplicated words,
Mattias Engdegård <=
- master e93bdfb 5/7: ; * doc/emacs/help.texi (Misc Help): @key{f1} -> @key{F1}, Mattias Engdegård, 2021/09/25
- master ed02b88 1/7: Renege on anonymous &rest (bug#50268, bug#50720), Mattias Engdegård, 2021/09/25
- master e6656df 7/7: ; * lisp/wid-edit.el (natnum): rectify tag string, Mattias Engdegård, 2021/09/25
- master 8d0ee5e 4/7: Constant-propagate variables bound outside loops, Mattias Engdegård, 2021/09/25
- master 45c32d7 6/7: Fix byte-compiler crash for legal dynamic-binding code, Mattias Engdegård, 2021/09/25
- master 0b099e3 2/7: Use ambient lexical-binding value in ert-deftest body (bug#50738), Mattias Engdegård, 2021/09/25