summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-07-14 12:43:52 +0200
committerStefan Kangas <stefan@marxist.se>2022-07-14 12:52:32 +0200
commit41e612cfd684f03e34c8990df1b86b95e092211b (patch)
treed2ba94798f230db2835562679d0f3308fb1fd50f
parentade1238bce1cf69ebce8809a2d73cb92db94b977 (diff)
downloademacs-41e612cfd684f03e34c8990df1b86b95e092211b.tar.gz
; Fix typos
-rw-r--r--doc/lispref/commands.texi2
-rw-r--r--doc/lispref/variables.texi2
-rw-r--r--doc/misc/eshell.texi4
-rw-r--r--doc/misc/modus-themes.org4
-rw-r--r--etc/emacs_lldb.py2
-rw-r--r--lisp/doc-view.el2
-rw-r--r--lisp/emacs-lisp/loaddefs-gen.el4
-rw-r--r--lisp/face-remap.el2
-rw-r--r--src/haiku_support.h2
-rw-r--r--src/nsterm.m2
-rw-r--r--src/xfns.c2
-rw-r--r--src/xterm.c6
-rw-r--r--test/lisp/erc/resources/erc-d/erc-d-tests.el2
-rw-r--r--test/lisp/progmodes/python-tests.el2
-rw-r--r--test/manual/etags/cp-src/clheir.hpp2
-rw-r--r--test/manual/etags/merc-src/accumulator.m2
-rw-r--r--test/manual/etags/prol-src/natded.prolog2
-rwxr-xr-xtest/manual/indent/perl.perl2
18 files changed, 23 insertions, 23 deletions
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 865fa26b275..e37f6002430 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2078,7 +2078,7 @@ and @var{kind} as arguments.
@item load-changed
This xwidget event indicates that the @var{xwidget} has reached a
particular point of the page-loading process. When these events are
-sent, @var{arg} will contain a string that futher describes the status
+sent, @var{arg} will contain a string that further describes the status
of the widget:
@table @samp
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 13ad181cdd4..242b1a3be93 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -2843,7 +2843,7 @@ Common Lisp, this is not an error since the function @code{(setf
it, that value won't be automatically restored. Users usually set
normal variables in their startup files, or use Customize
(@pxref{Customization}) to set user options permanently, and various
-packages have various files wher they store the data (e.g., Gnus
+packages have various files where they store the data (e.g., Gnus
stores this in @file{.newsrc.eld} and the URL library stores cookies
in @file{~/.emacs.d/url/cookies}).
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 963657f102a..9f9c88582f3 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1072,7 +1072,7 @@ back to a number as above). For example, @samp{$list("a" "b")c}
returns @samp{("a" "bc")}.
@item anything else
-Concatenate the string represenation of each value.
+Concatenate the string representation of each value.
@end table
@@ -1615,7 +1615,7 @@ nor the decoded data, into Emacs buffers, as would normally happen.
The command is interpreted as extending up to the next @code{|}
character which is not preceded by an unescaped asterisk following
whitespace, or the end of the input if there is no such character.
-Thus, all @code{<} and @code{>} redirections occuring before the next
+Thus, all @code{<} and @code{>} redirections occurring before the next
asterisk-unprefixed @code{|} are implicitly prefixed with (whitespace
and) asterisks. An exception is that Eshell-specific redirects right
at the end of the command are excluded. This allows input like this:
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index d0d985705f1..943294b626c 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -1252,7 +1252,7 @@ accepts is as follows (order is not significant):
The ~popup~ key takes the same values as ~selection~.
-Apart from specfying each key separately, a fallback list is accepted.
+Apart from specifying each key separately, a fallback list is accepted.
This is only useful when the desired aesthetic is the same across all
keys that are not explicitly referenced. For example, this:
@@ -3347,7 +3347,7 @@ it if you plan to control face attributes.
:end:
#+cindex: Org custom emphasis faces
-Org provides the user option ~org-emphasis-alist~ which assosiates a
+Org provides the user option ~org-emphasis-alist~ which associates a
character with a face, list of faces, or face attributes. The default
specification of that variable looks like this:
diff --git a/etc/emacs_lldb.py b/etc/emacs_lldb.py
index 740cbc0956b..b8530915f81 100644
--- a/etc/emacs_lldb.py
+++ b/etc/emacs_lldb.py
@@ -27,7 +27,7 @@ import lldb
########################################################################
-# Utilties
+# Utilities
########################################################################
# Return the name of enumerator ENUM as a string.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 0f659fb8b37..f05ec938e55 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -238,7 +238,7 @@ Can be `dvi', `pdf', `ps', `djvu', `odf', `epub', `cbz', `fb2',
(defun doc-view--epub-reconvert (&optional _event)
"Reconvert all epub buffers.
-EVENT is unused, but neccesary to work with the filenotify API"
+EVENT is unused, but necessary to work with the filenotify API."
(dolist (x (buffer-list))
(with-current-buffer x
(when (eq doc-view-doc-type 'epub)
diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 2c92a8e7fe8..8a50b777da1 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -329,9 +329,9 @@ expression, in which case we want to handle forms differently."
'string<))))))
(defun loaddefs-generate--parse-file (file main-outfile &optional package-data)
- "Examing FILE for ;;;###autoload statements.
+ "Examining FILE for ;;;###autoload statements.
MAIN-OUTFILE is the main loaddefs file these statements are
-destined for, but this can be overriden by the buffer-local
+destined for, but this can be overridden by the buffer-local
setting of `generated-autoload-file' in FILE, and
by ;;;###foo-autoload statements.
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index fd49c81ab3f..432385587b4 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -481,7 +481,7 @@ used to invoke the command, with all modifiers removed:
After adjusting, further adjust the font size as long as the key,
with all modifiers removed, is one of the above characters.
-Buffer-local face adjustements have higher priority than global
+Buffer-local face adjustments have higher priority than global
face adjustments.
The variable `global-text-scale-adjust-resizes-frames' controls
diff --git a/src/haiku_support.h b/src/haiku_support.h
index 5f44494a8d3..5577d2f151f 100644
--- a/src/haiku_support.h
+++ b/src/haiku_support.h
@@ -398,7 +398,7 @@ struct haiku_font_pattern
/* Temporary field used during font enumeration. */
int oblique_seen_p;
- /* Whether or not to enable antialising in the font. This field is
+ /* Whether or not to enable antialiasing in the font. This field is
special in that it's not handled by `BFont_open_pattern'. */
int use_antialiasing;
};
diff --git a/src/nsterm.m b/src/nsterm.m
index 8e0c4b84f0e..2ba167f189b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -10917,7 +10917,7 @@ This variable is ignored on macOS < 10.7 and GNUstep. Default is t. */);
It is called with three arguments FRAME, X, and Y, whenever the user
moves the mouse over an Emacs frame as part of a drag-and-drop
operation. FRAME is the frame the mouse is on top of, and X and Y are
-the frame-relative positions of the mouse in the X and Y axises
+the frame-relative positions of the mouse in the X and Y axes
respectively. */);
Vns_drag_motion_function = Qns_handle_drag_motion;
diff --git a/src/xfns.c b/src/xfns.c
index 331f22763ee..41a9d710d44 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -6963,7 +6963,7 @@ that mouse buttons are being held down, such as immediately after a
xaction = FRAME_DISPLAY_INFO (f)->Xatom_XdndActionAsk;
else if (SYMBOLP (action))
/* This is to accommodate non-standard DND protocols such as XDS
- that are explictly implemented by Emacs, and is not documented
+ that are explicitly implemented by Emacs, and is not documented
for that reason. */
xaction = symbol_to_x_atom (FRAME_DISPLAY_INFO (f), action);
else if (CONSP (action))
diff --git a/src/xterm.c b/src/xterm.c
index 85367b78e3c..2ccd6b1613d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1433,7 +1433,7 @@ static bool x_dnd_use_toplevels;
/* Motif drag-and-drop protocol support. */
/* Pointer to a variable which stores whether or not an X error
- occured while trying to create the Motif drag window. */
+ occurred while trying to create the Motif drag window. */
static volatile bool *xm_drag_window_error;
typedef enum xm_byte_order
@@ -2308,7 +2308,7 @@ xm_get_drag_atom_1 (struct x_display_info *dpyinfo,
&actual_format, &nitems, &bytes_remaining,
&tmp_data);
atom = None;
- /* GCC thinks i is used unitialized, but it's always initialized if
+ /* GCC thinks i is used uninitialized, but it's always initialized if
`atoms' exists at that particular spot. */
i = 0;
@@ -28203,7 +28203,7 @@ you, try increasing the value of
x_mouse_click_focus_ignore_position = false;
DEFVAR_INT ("x-mouse-click-focus-ignore-time", x_mouse_click_focus_ignore_time,
- doc: /* Number of miliseconds for which to ignore buttons after focus change.
+ doc: /* Number of milliseconds for which to ignore buttons after focus change.
This variable only takes effect if
`x-mouse-click-focus-ignore-position' is non-nil, and should be
adjusted if the default value does not work for whatever reason. */);
diff --git a/test/lisp/erc/resources/erc-d/erc-d-tests.el b/test/lisp/erc/resources/erc-d/erc-d-tests.el
index f64b5e8a74c..21005cd7600 100644
--- a/test/lisp/erc/resources/erc-d/erc-d-tests.el
+++ b/test/lisp/erc/resources/erc-d/erc-d-tests.el
@@ -1046,7 +1046,7 @@ nonzero for this to work."
(kill-buffer client-buffer)
(kill-buffer dumb-server-buffer))))
-;; Without adjusting penalty, takes ~15 secs. With is comprable to direct ^.
+;; Without adjusting penalty, takes ~15 secs. With is comparable to direct ^.
(ert-deftest erc-d-run-fuzzy ()
:tags '(:expensive-test)
(let ((erc-server-flood-penalty 1.2) ; penalty < margin/sends is basically 0
diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index d7b3c102f2d..92c20288c8e 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -1875,7 +1875,7 @@ class C(object):
(python-tests-look-at "def m(self):" -1)
(beginning-of-line)
(point))))
- ;; Nested defuns shuld be skipped.
+ ;; Nested defuns should be skipped.
(python-tests-look-at "return a" -1)
(should (= (save-excursion
(python-nav-beginning-of-defun)
diff --git a/test/manual/etags/cp-src/clheir.hpp b/test/manual/etags/cp-src/clheir.hpp
index 55d91228fb3..831da5ca095 100644
--- a/test/manual/etags/cp-src/clheir.hpp
+++ b/test/manual/etags/cp-src/clheir.hpp
@@ -2,7 +2,7 @@
/* CLHEIR.H */
/* ======================================================================= */
-// CLASS HEIRARCHY
+// CLASS HIERARCHY
// Locations or Agents are both of type generic_object. Generic_objects may
// have states, and are responsible for updating their states appropriately
// when their step() functions are executed.
diff --git a/test/manual/etags/merc-src/accumulator.m b/test/manual/etags/merc-src/accumulator.m
index c82dbf58ff8..0ee41216c11 100644
--- a/test/manual/etags/merc-src/accumulator.m
+++ b/test/manual/etags/merc-src/accumulator.m
@@ -616,7 +616,7 @@ identify_recursive_calls(PredId, ProcId, GoalStore, Ids) :-
% Determine the variables which are members of the sets Out and Out',
% and initialize the substitutions between the two sets.
%
- % This is done by identifing those variables whose instantiatedness change
+ % This is done by identifying those variables whose instantiatedness change
% in the goals after the recursive call and are headvars.
%
% Note that we are only identifying the output variables which will need
diff --git a/test/manual/etags/prol-src/natded.prolog b/test/manual/etags/prol-src/natded.prolog
index f0ee6b41b12..08c81d48f61 100644
--- a/test/manual/etags/prol-src/natded.prolog
+++ b/test/manual/etags/prol-src/natded.prolog
@@ -371,7 +371,7 @@ derived_analyses([W|Ws],[W|DerWs]):-
% build(Ws:+<list(<word>)>, Right:+<int>, Left:-<int>)
% ----------------------------------------------------------------------
-% finishes building chart with Ws as remaing word, starting from
+% finishes building chart with Ws as remaining word, starting from
% right position Right and finishing on left position Left
% -- counts backwards, so Left > Right
% ----------------------------------------------------------------------
diff --git a/test/manual/indent/perl.perl b/test/manual/indent/perl.perl
index db94552a928..b44593da028 100755
--- a/test/manual/indent/perl.perl
+++ b/test/manual/indent/perl.perl
@@ -90,7 +90,7 @@ s:abc:def:g; # FIXME: the initial s is fontified like a label, and indented
s'def'ghi'g; # The middle ' should not end the quoting.
s"ghi"ijk"g; # The middle ' should not end the quoting.
-s#ijk#lmn#g; # This is a regular expression sustitution.
+s#ijk#lmn#g; # This is a regular expression substitution.
s #lmn#opq#g; # FIXME: this should be a comment starting with "#lmn"
/lmn/rst/g; # and this is the actual regular expression