aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2022-07-14 12:43:52 +0200
committerStefan Kangas2022-07-14 12:52:32 +0200
commit41e612cfd684f03e34c8990df1b86b95e092211b (patch)
treed2ba94798f230db2835562679d0f3308fb1fd50f
parentade1238bce1cf69ebce8809a2d73cb92db94b977 (diff)
downloademacs-41e612cfd684f03e34c8990df1b86b95e092211b.tar.gz
emacs-41e612cfd684f03e34c8990df1b86b95e092211b.zip
; 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.
2078@item load-changed 2078@item load-changed
2079This xwidget event indicates that the @var{xwidget} has reached a 2079This xwidget event indicates that the @var{xwidget} has reached a
2080particular point of the page-loading process. When these events are 2080particular point of the page-loading process. When these events are
2081sent, @var{arg} will contain a string that futher describes the status 2081sent, @var{arg} will contain a string that further describes the status
2082of the widget: 2082of the widget:
2083 2083
2084@table @samp 2084@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
2843it, that value won't be automatically restored. Users usually set 2843it, that value won't be automatically restored. Users usually set
2844normal variables in their startup files, or use Customize 2844normal variables in their startup files, or use Customize
2845(@pxref{Customization}) to set user options permanently, and various 2845(@pxref{Customization}) to set user options permanently, and various
2846packages have various files wher they store the data (e.g., Gnus 2846packages have various files where they store the data (e.g., Gnus
2847stores this in @file{.newsrc.eld} and the URL library stores cookies 2847stores this in @file{.newsrc.eld} and the URL library stores cookies
2848in @file{~/.emacs.d/url/cookies}). 2848in @file{~/.emacs.d/url/cookies}).
2849 2849
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}
1072returns @samp{("a" "bc")}. 1072returns @samp{("a" "bc")}.
1073 1073
1074@item anything else 1074@item anything else
1075Concatenate the string represenation of each value. 1075Concatenate the string representation of each value.
1076 1076
1077@end table 1077@end table
1078 1078
@@ -1615,7 +1615,7 @@ nor the decoded data, into Emacs buffers, as would normally happen.
1615The command is interpreted as extending up to the next @code{|} 1615The command is interpreted as extending up to the next @code{|}
1616character which is not preceded by an unescaped asterisk following 1616character which is not preceded by an unescaped asterisk following
1617whitespace, or the end of the input if there is no such character. 1617whitespace, or the end of the input if there is no such character.
1618Thus, all @code{<} and @code{>} redirections occuring before the next 1618Thus, all @code{<} and @code{>} redirections occurring before the next
1619asterisk-unprefixed @code{|} are implicitly prefixed with (whitespace 1619asterisk-unprefixed @code{|} are implicitly prefixed with (whitespace
1620and) asterisks. An exception is that Eshell-specific redirects right 1620and) asterisks. An exception is that Eshell-specific redirects right
1621at the end of the command are excluded. This allows input like this: 1621at 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):
1252 1252
1253The ~popup~ key takes the same values as ~selection~. 1253The ~popup~ key takes the same values as ~selection~.
1254 1254
1255Apart from specfying each key separately, a fallback list is accepted. 1255Apart from specifying each key separately, a fallback list is accepted.
1256This is only useful when the desired aesthetic is the same across all 1256This is only useful when the desired aesthetic is the same across all
1257keys that are not explicitly referenced. For example, this: 1257keys that are not explicitly referenced. For example, this:
1258 1258
@@ -3347,7 +3347,7 @@ it if you plan to control face attributes.
3347:end: 3347:end:
3348#+cindex: Org custom emphasis faces 3348#+cindex: Org custom emphasis faces
3349 3349
3350Org provides the user option ~org-emphasis-alist~ which assosiates a 3350Org provides the user option ~org-emphasis-alist~ which associates a
3351character with a face, list of faces, or face attributes. The default 3351character with a face, list of faces, or face attributes. The default
3352specification of that variable looks like this: 3352specification of that variable looks like this:
3353 3353
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
27 27
28 28
29######################################################################## 29########################################################################
30# Utilties 30# Utilities
31######################################################################## 31########################################################################
32 32
33# Return the name of enumerator ENUM as a string. 33# 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',
238(defun doc-view--epub-reconvert (&optional _event) 238(defun doc-view--epub-reconvert (&optional _event)
239 "Reconvert all epub buffers. 239 "Reconvert all epub buffers.
240 240
241EVENT is unused, but neccesary to work with the filenotify API" 241EVENT is unused, but necessary to work with the filenotify API."
242 (dolist (x (buffer-list)) 242 (dolist (x (buffer-list))
243 (with-current-buffer x 243 (with-current-buffer x
244 (when (eq doc-view-doc-type 'epub) 244 (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."
329 'string<)))))) 329 'string<))))))
330 330
331(defun loaddefs-generate--parse-file (file main-outfile &optional package-data) 331(defun loaddefs-generate--parse-file (file main-outfile &optional package-data)
332 "Examing FILE for ;;;###autoload statements. 332 "Examining FILE for ;;;###autoload statements.
333MAIN-OUTFILE is the main loaddefs file these statements are 333MAIN-OUTFILE is the main loaddefs file these statements are
334destined for, but this can be overriden by the buffer-local 334destined for, but this can be overridden by the buffer-local
335setting of `generated-autoload-file' in FILE, and 335setting of `generated-autoload-file' in FILE, and
336by ;;;###foo-autoload statements. 336by ;;;###foo-autoload statements.
337 337
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:
481After adjusting, further adjust the font size as long as the key, 481After adjusting, further adjust the font size as long as the key,
482with all modifiers removed, is one of the above characters. 482with all modifiers removed, is one of the above characters.
483 483
484Buffer-local face adjustements have higher priority than global 484Buffer-local face adjustments have higher priority than global
485face adjustments. 485face adjustments.
486 486
487The variable `global-text-scale-adjust-resizes-frames' controls 487The 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
398 /* Temporary field used during font enumeration. */ 398 /* Temporary field used during font enumeration. */
399 int oblique_seen_p; 399 int oblique_seen_p;
400 400
401 /* Whether or not to enable antialising in the font. This field is 401 /* Whether or not to enable antialiasing in the font. This field is
402 special in that it's not handled by `BFont_open_pattern'. */ 402 special in that it's not handled by `BFont_open_pattern'. */
403 int use_antialiasing; 403 int use_antialiasing;
404}; 404};
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. */);
10917It is called with three arguments FRAME, X, and Y, whenever the user 10917It is called with three arguments FRAME, X, and Y, whenever the user
10918moves the mouse over an Emacs frame as part of a drag-and-drop 10918moves the mouse over an Emacs frame as part of a drag-and-drop
10919operation. FRAME is the frame the mouse is on top of, and X and Y are 10919operation. FRAME is the frame the mouse is on top of, and X and Y are
10920the frame-relative positions of the mouse in the X and Y axises 10920the frame-relative positions of the mouse in the X and Y axes
10921respectively. */); 10921respectively. */);
10922 Vns_drag_motion_function = Qns_handle_drag_motion; 10922 Vns_drag_motion_function = Qns_handle_drag_motion;
10923 10923
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
6963 xaction = FRAME_DISPLAY_INFO (f)->Xatom_XdndActionAsk; 6963 xaction = FRAME_DISPLAY_INFO (f)->Xatom_XdndActionAsk;
6964 else if (SYMBOLP (action)) 6964 else if (SYMBOLP (action))
6965 /* This is to accommodate non-standard DND protocols such as XDS 6965 /* This is to accommodate non-standard DND protocols such as XDS
6966 that are explictly implemented by Emacs, and is not documented 6966 that are explicitly implemented by Emacs, and is not documented
6967 for that reason. */ 6967 for that reason. */
6968 xaction = symbol_to_x_atom (FRAME_DISPLAY_INFO (f), action); 6968 xaction = symbol_to_x_atom (FRAME_DISPLAY_INFO (f), action);
6969 else if (CONSP (action)) 6969 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;
1433/* Motif drag-and-drop protocol support. */ 1433/* Motif drag-and-drop protocol support. */
1434 1434
1435/* Pointer to a variable which stores whether or not an X error 1435/* Pointer to a variable which stores whether or not an X error
1436 occured while trying to create the Motif drag window. */ 1436 occurred while trying to create the Motif drag window. */
1437static volatile bool *xm_drag_window_error; 1437static volatile bool *xm_drag_window_error;
1438 1438
1439typedef enum xm_byte_order 1439typedef enum xm_byte_order
@@ -2308,7 +2308,7 @@ xm_get_drag_atom_1 (struct x_display_info *dpyinfo,
2308 &actual_format, &nitems, &bytes_remaining, 2308 &actual_format, &nitems, &bytes_remaining,
2309 &tmp_data); 2309 &tmp_data);
2310 atom = None; 2310 atom = None;
2311 /* GCC thinks i is used unitialized, but it's always initialized if 2311 /* GCC thinks i is used uninitialized, but it's always initialized if
2312 `atoms' exists at that particular spot. */ 2312 `atoms' exists at that particular spot. */
2313 i = 0; 2313 i = 0;
2314 2314
@@ -28203,7 +28203,7 @@ you, try increasing the value of
28203 x_mouse_click_focus_ignore_position = false; 28203 x_mouse_click_focus_ignore_position = false;
28204 28204
28205 DEFVAR_INT ("x-mouse-click-focus-ignore-time", x_mouse_click_focus_ignore_time, 28205 DEFVAR_INT ("x-mouse-click-focus-ignore-time", x_mouse_click_focus_ignore_time,
28206 doc: /* Number of miliseconds for which to ignore buttons after focus change. 28206 doc: /* Number of milliseconds for which to ignore buttons after focus change.
28207This variable only takes effect if 28207This variable only takes effect if
28208`x-mouse-click-focus-ignore-position' is non-nil, and should be 28208`x-mouse-click-focus-ignore-position' is non-nil, and should be
28209adjusted if the default value does not work for whatever reason. */); 28209adjusted 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."
1046 (kill-buffer client-buffer) 1046 (kill-buffer client-buffer)
1047 (kill-buffer dumb-server-buffer)))) 1047 (kill-buffer dumb-server-buffer))))
1048 1048
1049;; Without adjusting penalty, takes ~15 secs. With is comprable to direct ^. 1049;; Without adjusting penalty, takes ~15 secs. With is comparable to direct ^.
1050(ert-deftest erc-d-run-fuzzy () 1050(ert-deftest erc-d-run-fuzzy ()
1051 :tags '(:expensive-test) 1051 :tags '(:expensive-test)
1052 (let ((erc-server-flood-penalty 1.2) ; penalty < margin/sends is basically 0 1052 (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):
1875 (python-tests-look-at "def m(self):" -1) 1875 (python-tests-look-at "def m(self):" -1)
1876 (beginning-of-line) 1876 (beginning-of-line)
1877 (point)))) 1877 (point))))
1878 ;; Nested defuns shuld be skipped. 1878 ;; Nested defuns should be skipped.
1879 (python-tests-look-at "return a" -1) 1879 (python-tests-look-at "return a" -1)
1880 (should (= (save-excursion 1880 (should (= (save-excursion
1881 (python-nav-beginning-of-defun) 1881 (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 @@
2/* CLHEIR.H */ 2/* CLHEIR.H */
3/* ======================================================================= */ 3/* ======================================================================= */
4 4
5// CLASS HEIRARCHY 5// CLASS HIERARCHY
6// Locations or Agents are both of type generic_object. Generic_objects may 6// Locations or Agents are both of type generic_object. Generic_objects may
7// have states, and are responsible for updating their states appropriately 7// have states, and are responsible for updating their states appropriately
8// when their step() functions are executed. 8// 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) :-
616 % Determine the variables which are members of the sets Out and Out', 616 % Determine the variables which are members of the sets Out and Out',
617 % and initialize the substitutions between the two sets. 617 % and initialize the substitutions between the two sets.
618 % 618 %
619 % This is done by identifing those variables whose instantiatedness change 619 % This is done by identifying those variables whose instantiatedness change
620 % in the goals after the recursive call and are headvars. 620 % in the goals after the recursive call and are headvars.
621 % 621 %
622 % Note that we are only identifying the output variables which will need 622 % 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]):-
371 371
372% build(Ws:+<list(<word>)>, Right:+<int>, Left:-<int>) 372% build(Ws:+<list(<word>)>, Right:+<int>, Left:-<int>)
373% ---------------------------------------------------------------------- 373% ----------------------------------------------------------------------
374% finishes building chart with Ws as remaing word, starting from 374% finishes building chart with Ws as remaining word, starting from
375% right position Right and finishing on left position Left 375% right position Right and finishing on left position Left
376% -- counts backwards, so Left > Right 376% -- counts backwards, so Left > Right
377% ---------------------------------------------------------------------- 377% ----------------------------------------------------------------------
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
90s'def'ghi'g; # The middle ' should not end the quoting. 90s'def'ghi'g; # The middle ' should not end the quoting.
91s"ghi"ijk"g; # The middle ' should not end the quoting. 91s"ghi"ijk"g; # The middle ' should not end the quoting.
92 92
93s#ijk#lmn#g; # This is a regular expression sustitution. 93s#ijk#lmn#g; # This is a regular expression substitution.
94 94
95s #lmn#opq#g; # FIXME: this should be a comment starting with "#lmn" 95s #lmn#opq#g; # FIXME: this should be a comment starting with "#lmn"
96 /lmn/rst/g; # and this is the actual regular expression 96 /lmn/rst/g; # and this is the actual regular expression