[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 920a7d38e9: ; Fix typos
|
From: |
Stefan Kangas |
|
Subject: |
emacs-29 920a7d38e9: ; Fix typos |
|
Date: |
Sat, 14 Jan 2023 20:20:15 -0500 (EST) |
branch: emacs-29
commit 920a7d38e96134289393b7bfcc3a7b88be73925b
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
; Fix typos
---
doc/misc/modus-themes.org | 4 +-
lisp/icomplete.el | 4 +-
lisp/org/org-mouse.el | 4 +-
lisp/simple.el | 4 +-
lisp/woman.el | 60 +++++++++++-----------
src/ccl.c | 2 +-
src/keyboard.c | 2 +-
src/regex-emacs.c | 2 +-
.../erc/resources/networks/merge-server/track.eld | 2 +-
test/manual/indent/octave.m | 2 +-
10 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 0dbe7a6c5b..4bf78379c1 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -2811,7 +2811,7 @@ that can be overridden):
As one can tell, we bind a key to a hexadecimal RGB color value. Now
say we wish to override those specific values and have our changes
propagate to all faces that use those keys. We could write something
-like this, which adds a subtle ochre tint:
+like this, which adds a subtle ocher tint:
#+begin_src emacs-lisp
(setq modus-themes-operandi-color-overrides
@@ -2886,7 +2886,7 @@ look like this:
With those in place, one can use {{{kbd(M-x my-modus-themes-tinted)}}}
and then load the Modus theme of their choice. The new palette subset
-will come into effect: subtle ochre tints (or shades of gray) for Modus
+will come into effect: subtle ocher tints (or shades of gray) for Modus
Operandi and night sky blue shades for Modus Vivendi. Switching between
the two themes, such as with {{{kbd(M-x modus-themes-toggle)}}} will
also use the overrides.
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 9fa622017f..014f38b202 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -252,7 +252,7 @@ the default otherwise."
"Step forward completions by one entry.
Second entry becomes the first and can be selected with
`icomplete-force-complete-and-exit'.
-Return non-nil iff something was stepped."
+Return non-nil if something was stepped."
(interactive)
(let* ((beg (icomplete--field-beg))
(end (icomplete--field-end))
@@ -270,7 +270,7 @@ Return non-nil iff something was stepped."
"Step backward completions by one entry.
Last entry becomes the first and can be selected with
`icomplete-force-complete-and-exit'.
-Return non-nil iff something was stepped."
+Return non-nil if something was stepped."
(interactive)
(let* ((beg (icomplete--field-beg))
(end (icomplete--field-end))
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 6a733f09db..3b2c4cba62 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -241,7 +241,7 @@ return `:middle'."
(t :middle)))
(defun org-mouse-empty-line ()
- "Return non-nil iff the line contains only white space."
+ "Return non-nil if the line contains only white space."
(save-excursion (beginning-of-line) (looking-at "[ \t]*$")))
(defun org-mouse-next-heading ()
@@ -283,7 +283,7 @@ keyword as the only argument.
If SELECTED is nil, then all items are normal menu items. If
SELECTED is a function, then each item is a checkbox, which is
-enabled for a given keyword iff (funcall SELECTED keyword) return
+enabled for a given keyword if (funcall SELECTED keyword) return
non-nil. If SELECTED is neither nil nor a function, then the
items are radio buttons. A radio button is enabled for the
keyword `equal' to SELECTED.
diff --git a/lisp/simple.el b/lisp/simple.el
index bb0ed092b7..3f3dbe78c3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2228,8 +2228,8 @@ are available:
This includes commands marked as specific to the current
buffer's modes and commands that have keybindings in the
current buffer's active local keymaps. It also includes
- several commands, like Cuztomize commands, which should
- always be avaliable."
+ several commands, like Customize commands, which should
+ always be available."
:version "28.1"
:group 'completion
:type '(choice (const :tag "Don't exclude any commands" nil)
diff --git a/lisp/woman.el b/lisp/woman.el
index dfb5e69778..92cd425d32 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2355,7 +2355,7 @@ Currently set only from \\='\\\" t in the first line of
the source file.")
(point-max)))
(defun woman-horizontal-escapes (to)
- "Process \\h'+/-N' local horizontal motion escapes upto TO.
+ "Process \\h'+/-N' local horizontal motion escapes up to TO.
Implements arbitrary forward and non-overlapping backward motion.
Preserves location of `point'."
;; Moved from `woman-decode-region' for version 0.50.
@@ -3346,7 +3346,7 @@ Ignore the default face and underline only word
characters."
(defun woman2-tr (to)
".tr abcde -- Translate a -> b, c -> d, ..., e -> space.
-Format paragraphs upto TO. Supports special chars.
+Format paragraphs up to TO. Supports special chars.
\(Breaks, but should not.)"
;; This should be an update, but consing onto the front of the alist
;; has the same effect and match duplicates should not matter.
@@ -3402,7 +3402,7 @@ Format paragraphs upto TO. Supports special chars.
(defvar woman-registers ; these are all read-only
'((".H" 24) (".V" 48) ; resolution in basic units
(".g" 0) ; not groff
- ;; (Iff emulating groff need to implement groff italic correction
+ ;; (If emulating groff need to implement groff italic correction
;; \/, e.g. for pic.1)
(".i" left-margin) ; current indent
(".j" woman-adjust) ; current adjustment
@@ -3432,7 +3432,7 @@ Handle numeric arguments specially if optional argument
NUMERIC is non-nil."
(defun woman2-nr (to)
".nr R +/-N M -- Assign +/-N (wrt to previous value, if any) to register R.
The increment for auto-incrementing is set to M.
-Format paragraphs upto TO. (Breaks, but should not!)"
+Format paragraphs up to TO. (Breaks, but should not!)"
(let* ((name (buffer-substring
(point)
(progn (skip-syntax-forward "^ ") (point))))
@@ -3699,7 +3699,7 @@ regexp, \"\\(\\\\c\\)?\\n[.\\=']\"."
(defun woman2-PD (to)
".PD d -- Set the interparagraph distance to d.
-Round to whole lines, default 1 line. Format paragraphs upto TO.
+Round to whole lines, default 1 line. Format paragraphs up to TO.
\(Breaks, but should not.)"
;; .ie \\n[.$] .nr PD (v;\\$1)
;; .el .nr PD .4v>?\n[.V]
@@ -3718,7 +3718,7 @@ Round to whole lines, default 1 line. Format paragraphs
upto TO.
(setq woman-leave-blank-lines woman-interparagraph-distance))
(defun woman2-TH (to)
- ".TH n c x v m -- Begin a man page. Format paragraphs upto TO.
+ ".TH n c x v m -- Begin a man page. Format paragraphs up to TO.
n is the name of the page in chapter c; x is extra commentary;
v alters page foot left; m alters page head center.
\(Should set prevailing indent and tabs to 5.)"
@@ -3748,7 +3748,7 @@ v alters page foot left; m alters page head center.
(defun woman2-SH (to)
".SH -- Sub-head. Leave blank line and subhead.
-Format paragraphs upto TO. Set prevailing indent to 5."
+Format paragraphs up to TO. Set prevailing indent to 5."
(if (eolp) ; If no args then
(delete-char 1) ; apply to next line
(woman-unquote-args) ; else unquote to end of heading
@@ -3767,7 +3767,7 @@ Format paragraphs upto TO. Set prevailing indent to 5."
(defun woman2-SS (to)
".SS -- Sub-sub-head. Like .SH but indent heading 3 spaces.
-Format paragraphs upto TO."
+Format paragraphs up to TO."
(if (eolp) ; If no args then
(delete-char 1)) ; apply to next line.
(insert " ")
@@ -3776,7 +3776,7 @@ Format paragraphs upto TO."
(defun woman2-LP (to)
".LP,.PP -- Begin paragraph. Set prevailing indent to 5.
-Leave 1 blank line. Format paragraphs upto TO."
+Leave 1 blank line. Format paragraphs up to TO."
(woman-delete-line 1) ; ignore any arguments
(woman-interparagraph-space)
(setq woman-prevailing-indent woman-default-indent)
@@ -3786,21 +3786,21 @@ Leave 1 blank line. Format paragraphs upto TO."
(defalias 'woman2-P #'woman2-LP)
(defun woman2-ns (to)
- ".ns -- Turn on no-space mode. Format paragraphs upto TO."
+ ".ns -- Turn on no-space mode. Format paragraphs up to TO."
;; Should not cause a break!
(woman-delete-line 1) ; ignore argument(s)
(setq woman-nospace t)
(woman2-format-paragraphs to))
(defun woman2-rs (to)
- ".rs -- Turn off no-space mode. Format paragraphs upto TO."
+ ".rs -- Turn off no-space mode. Format paragraphs up to TO."
;; Should not cause a break!
(woman-delete-line 1) ; ignore argument(s)
(setq woman-nospace nil)
(woman2-format-paragraphs to))
(defun woman2-sp (to)
- ".sp N -- If N > 0 then leave 1 blank line. Format paragraphs upto TO."
+ ".sp N -- If N > 0 then leave 1 blank line. Format paragraphs up to TO."
(let ((N (if (eolp) 1 (woman-get-numeric-arg))))
(if (>= N 0)
(woman-delete-line 1) ; ignore argument(s)
@@ -3955,13 +3955,13 @@ Optional argument NUMERIC, if non-nil, means the
argument is numeric."
;;; 4. Text Filling, Adjusting, and Centering
(defun woman2-br (to)
- ".br -- Break. Leave no blank line. Format paragraphs upto TO."
+ ".br -- Break. Leave no blank line. Format paragraphs up to TO."
(woman-delete-line 1) ; ignore any arguments
(woman2-format-paragraphs to))
(defun woman2-fi (to)
".fi -- Fill subsequent output lines. Leave no blank line.
-Format paragraphs upto TO."
+Format paragraphs up to TO."
(setq woman-nofill nil)
(woman-delete-line 1) ; ignore any arguments
;; Preserve any final blank line in the nofill region:
@@ -3981,7 +3981,7 @@ for the current line length. Format paragraphs up to TO."
(defun woman2-ad (to)
".ad c -- Line adjustment is begun (once fill mode is on).
Set justification mode to c if specified.
-Format paragraphs upto TO. (Breaks, but should not.)"
+Format paragraphs up to TO. (Breaks, but should not.)"
;; c = l -- left, r -- right, c -- center, b or n -- both,
;; absent -- unchanged. Initial mode adj,both.
(setq woman-adjust
@@ -3997,7 +3997,7 @@ Format paragraphs upto TO. (Breaks, but should not.)"
(woman2-format-paragraphs to))
(defun woman2-na (to)
- ".na -- No adjusting. Format paragraphs upto TO.
+ ".na -- No adjusting. Format paragraphs up to TO.
\(Breaks, but should not.)"
(setq woman-adjust-previous woman-adjust
woman-justify-previous woman-justify
@@ -4037,7 +4037,7 @@ non-nil and non-zero."
(defvar woman-temp-indent nil)
(defun woman2-format-paragraphs (to &optional new-left)
- "Indent, fill and adjust paragraphs upto TO to current left margin.
+ "Indent, fill and adjust paragraphs up to TO to current left margin.
If optional arg NEW-LEFT is non-nil then reset current left margin.
If `woman-nofill' is non-nil then indent without filling or adjusting."
;; Blank space should only ever be output before text.
@@ -4103,7 +4103,7 @@ If `woman-nofill' is non-nil then indent without filling
or adjusting."
;;; Tagged, indented and hanging paragraphs:
(defun woman2-TP (to)
- ".TP i -- Set prevailing indent to i. Format paragraphs upto TO.
+ ".TP i -- Set prevailing indent to i. Format paragraphs up to TO.
Begin indented paragraph with hanging tag given by next text line.
If tag doesn't fit, place it on a separate line."
(let ((i (woman2-get-prevailing-indent)))
@@ -4111,7 +4111,7 @@ If tag doesn't fit, place it on a separate line."
(woman2-tagged-paragraph to i)))
(defun woman2-IP (to)
- ".IP x i -- Same as .TP with tag x. Format paragraphs upto TO."
+ ".IP x i -- Same as .TP with tag x. Format paragraphs up to TO."
(woman-interparagraph-space)
(if (eolp) ; no args
;; Like LP without resetting prevailing indent
@@ -4152,7 +4152,7 @@ If tag doesn't fit, place it on a separate line."
(defun woman2-tagged-paragraph (to i)
"Begin indented paragraph with hanging tag given by current text line.
If tag doesn't fit, leave it on separate line.
-Format paragraphs upto TO. Set prevailing indent to I."
+Format paragraphs up to TO. Set prevailing indent to I."
(if (not (looking-at "\\s *$")) ; non-empty tag
(setq woman-leave-blank-lines nil))
@@ -4206,7 +4206,7 @@ Format paragraphs upto TO. Set prevailing indent to I."
(goto-char to)))))
(defun woman2-HP (to)
- ".HP i -- Set prevailing indent to i. Format paragraphs upto TO.
+ ".HP i -- Set prevailing indent to i. Format paragraphs up to TO.
Begin paragraph with hanging indent."
(let ((i (woman2-get-prevailing-indent)))
(woman-interparagraph-space)
@@ -4228,7 +4228,7 @@ Delete line from point and eol unless LEAVE-EOL is
non-nil."
(defun woman2-RS (to)
".RS i -- Start relative indent, move left margin in distance i.
-Set prevailing indent to 5 for nested indents. Format paragraphs upto TO."
+Set prevailing indent to 5 for nested indents. Format paragraphs up to TO."
(push woman-left-margin woman-RS-left-margin)
(push woman-prevailing-indent woman-RS-prevailing-indent)
(setq woman-left-margin (+ woman-left-margin
@@ -4237,7 +4237,7 @@ Set prevailing indent to 5 for nested indents. Format
paragraphs upto TO."
(woman2-format-paragraphs to woman-left-margin))
(defun woman2-RE (to)
- ".RE -- End of relative indent. Format paragraphs upto TO.
+ ".RE -- End of relative indent. Format paragraphs up to TO.
Set prevailing indent to amount of starting .RS."
(when woman-RS-left-margin
(setq woman-left-margin (pop woman-RS-left-margin)))
@@ -4274,18 +4274,18 @@ otherwise set PREVIOUS. Delete the whole remaining
control line."
(defun woman2-ll (to)
".ll +/-N -- Set, increment or decrement line length.
-Format paragraphs upto TO. (Breaks, but should not.)"
+Format paragraphs up to TO. (Breaks, but should not.)"
(woman-set-arg 'fill-column 'woman-ll-fill-column)
(woman2-format-paragraphs to))
(defun woman2-in (to)
".in +/-N -- Set, increment or decrement the indent.
-Format paragraphs upto TO."
+Format paragraphs up to TO."
(woman-set-arg 'left-margin 'woman-in-left-margin)
(woman2-format-paragraphs to))
(defun woman2-ti (to)
- ".ti +/-N -- Temporary indent. Format paragraphs upto TO."
+ ".ti +/-N -- Temporary indent. Format paragraphs up to TO."
;; Ignore if no argument.
;; Indent next output line only wrt current indent.
;; Current indent is not changed.
@@ -4300,7 +4300,7 @@ Format paragraphs upto TO."
".ta Nt ... -- Set tabs, left type, unless t=R(right), C(centered).
\(Breaks, but should not.) The tab stops are separated by spaces;
a value preceded by + represents an increment to the previous stop value.
-Format paragraphs upto TO."
+Format paragraphs up to TO."
(setq tab-stop-list nil)
(woman2-process-escapes-to-eol 'numeric)
(save-excursion
@@ -4350,7 +4350,7 @@ tab stop columns or pairs (COLUMN . TYPE) where TYPE is R
or C."
(insert ?\s))))
(defun woman2-DT (to)
- ".DT -- Restore default tabs. Format paragraphs upto TO.
+ ".DT -- Restore default tabs. Format paragraphs up to TO.
\(Breaks, but should not.)"
;; Currently just terminates special tab processing.
(setq tab-stop-list nil)
@@ -4359,7 +4359,7 @@ tab stop columns or pairs (COLUMN . TYPE) where TYPE is R
or C."
(defun woman2-fc (to)
".fc a b -- Set field delimiter a and pad character b.
-Format paragraphs upto TO.
+Format paragraphs up to TO.
A VERY FIRST ATTEMPT to make fields at least readable!
Needs doing properly!"
(if (eolp)
@@ -4395,7 +4395,7 @@ Needs doing properly!"
(defun woman2-TS (to)
".TS -- Start of table code for the tbl processor.
-Format paragraphs upto TO."
+Format paragraphs up to TO."
(when woman-emulate-tbl
;; Assumes column separator is \t and intercolumn spacing is 3.
;; The first line may optionally be a list of options terminated by
diff --git a/src/ccl.c b/src/ccl.c
index c92684f4bc..6e780ef9f0 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1987,7 +1987,7 @@ ccl_get_compiled_code (Lisp_Object ccl_prog, ptrdiff_t
*idx)
/* Setup fields of the structure pointed by CCL appropriately for the
execution of CCL program CCL_PROG. CCL_PROG is the name (symbol)
of the CCL program or the already compiled code (vector).
- Return true iff successful.
+ Return true if successful.
If CCL_PROG is nil, just reset the structure pointed by CCL. */
bool
diff --git a/src/keyboard.c b/src/keyboard.c
index 0ed2807033..6f0f075e54 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10010,7 +10010,7 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object
prompt,
if (/* first_unbound < indec.start && first_unbound < fkey.start && */
first_unbound < keytran.start)
- { /* The prefix upto first_unbound has no binding and has
+ { /* The prefix up to first_unbound has no binding and has
no translation left to do either, so we know it's unbound.
If we don't stop now, we risk staying here indefinitely
(if the user keeps entering fkey or keytran prefixes
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 6b2fa5df03..2dca0d16ad 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -223,7 +223,7 @@ typedef enum
is followed by a range table:
2 bytes of flags for character sets (low 8 bits, high 8 bits)
See RANGE_TABLE_WORK_BITS below.
- 2 bytes, the number of pairs that follow (upto 32767)
+ 2 bytes, the number of pairs that follow (up to 32767)
pairs, each 2 multibyte characters,
each multibyte character represented as 3 bytes. */
charset,
diff --git a/test/lisp/erc/resources/networks/merge-server/track.eld
b/test/lisp/erc/resources/networks/merge-server/track.eld
index 4a97f92f72..19c37aaf40 100644
--- a/test/lisp/erc/resources/networks/merge-server/track.eld
+++ b/test/lisp/erc/resources/networks/merge-server/track.eld
@@ -21,7 +21,7 @@
(0.00 ":irc.example.net 376 tester :End of message of the day."))
((mode 10 "MODE tester +i")
- (0.00 ":irc.example.net 501 tester x :is not a recognised user mode.")
+ (0.00 ":irc.example.net 501 tester x :is not a recognized user mode.")
(0.00 ":NickServ!NickServ@services.int NOTICE tester :Welcome to FooNet,
tester! Here on FooNet, we provide services to enable the registration of
nicknames and channels! For details, type \2/msg NickServ help\2 and \2/msg
ChanServ help\2.")
(0.02 ":tester!user@10.0.2.100 MODE tester :+i"))
diff --git a/test/manual/indent/octave.m b/test/manual/indent/octave.m
index 76cad09ad1..08b7fa58d5 100644
--- a/test/manual/indent/octave.m
+++ b/test/manual/indent/octave.m
@@ -1517,7 +1517,7 @@ function copy_files (desc, packdir, global_install)
if (exist (fullfile (desc.dir, getarch ()), "dir") &&
! strcmp (fullfile (desc.dir, getarch ()), octfiledir))
if (! exist (octfiledir, "dir"))
- ## Can be required to create upto three levels of dirs.
+ ## Can be required to create up to three levels of dirs.
octm1 = fileparts (octfiledir);
if (! exist (octm1, "dir"))
octm2 = fileparts (octm1);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 920a7d38e9: ; Fix typos,
Stefan Kangas <=