aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Kangas2023-12-10 13:22:04 +0100
committerStefan Kangas2023-12-10 13:22:04 +0100
commit06a12b0cccbda419752f3388346be7d302ebcbeb (patch)
tree69c3a4c23638553993a7580cae4a4d597fd8e258 /src
parent1d5028ad0414cad458aac1102d3612e4956068c5 (diff)
downloademacs-06a12b0cccbda419752f3388346be7d302ebcbeb.tar.gz
emacs-06a12b0cccbda419752f3388346be7d302ebcbeb.zip
; Fix typos
Diffstat (limited to 'src')
-rw-r--r--src/android.c4
-rw-r--r--src/androidselect.c2
-rw-r--r--src/androidterm.c4
-rw-r--r--src/androidterm.h2
-rw-r--r--src/androidvfs.c8
-rw-r--r--src/fileio.c2
-rw-r--r--src/image.c2
-rw-r--r--src/process.c2
-rw-r--r--src/regex-emacs.c2
-rw-r--r--src/sfnt.c14
-rw-r--r--src/sfnt.h2
-rw-r--r--src/sfntfont.c6
-rw-r--r--src/textconv.c6
-rw-r--r--src/treesit.c2
-rw-r--r--src/window.h2
-rw-r--r--src/xselect.c2
-rw-r--r--src/xterm.c10
17 files changed, 36 insertions, 36 deletions
diff --git a/src/android.c b/src/android.c
index 51622f16230..7a393f8f56d 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2779,7 +2779,7 @@ android_destroy_handle (android_handle handle)
2779 2779
2780 /* Just clear any exception thrown. If destroying the handle 2780 /* Just clear any exception thrown. If destroying the handle
2781 fails from an out-of-memory error, then Emacs loses some 2781 fails from an out-of-memory error, then Emacs loses some
2782 resources, but that is not as big deal as signalling. */ 2782 resources, but that is not as big deal as signaling. */
2783 (*android_java_env)->ExceptionClear (android_java_env); 2783 (*android_java_env)->ExceptionClear (android_java_env);
2784 2784
2785 /* Delete the global reference regardless of any error. */ 2785 /* Delete the global reference regardless of any error. */
@@ -5797,7 +5797,7 @@ android_check_string (Lisp_Object text)
5797 better represent the UCS-16 based Java String format, and to let 5797 better represent the UCS-16 based Java String format, and to let
5798 strings contain NULL characters while remaining valid C strings: 5798 strings contain NULL characters while remaining valid C strings:
5799 NULL bytes are encoded as two-byte sequences, and Unicode surrogate 5799 NULL bytes are encoded as two-byte sequences, and Unicode surrogate
5800 pairs encoded as two-byte sequences are prefered to four-byte 5800 pairs encoded as two-byte sequences are preferred to four-byte
5801 sequences when encoding characters above the BMP. */ 5801 sequences when encoding characters above the BMP. */
5802 5802
5803int 5803int
diff --git a/src/androidselect.c b/src/androidselect.c
index f7988db0520..e7a6ee258a8 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -299,7 +299,7 @@ data type available from the clipboard. */)
299 bytes_array); 299 bytes_array);
300 for (i = 0; i < length; ++i) 300 for (i = 0; i < length; ++i)
301 { 301 {
302 /* Retireve the MIME type. */ 302 /* Retrieve the MIME type. */
303 bytes 303 bytes
304 = (*android_java_env)->GetObjectArrayElement (android_java_env, 304 = (*android_java_env)->GetObjectArrayElement (android_java_env,
305 bytes_array, i); 305 bytes_array, i);
diff --git a/src/androidterm.c b/src/androidterm.c
index cfb64cd69a0..c3a04fd3cfb 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -6101,7 +6101,7 @@ android_update_selection (struct frame *f, struct window *w)
6101 else 6101 else
6102 start = -1, end = -1; 6102 start = -1, end = -1;
6103 6103
6104 /* Now constrain START and END to the maximium size of a Java 6104 /* Now constrain START and END to the maximum size of a Java
6105 integer. */ 6105 integer. */
6106 start = min (start, TYPE_MAXIMUM (jint)); 6106 start = min (start, TYPE_MAXIMUM (jint));
6107 end = min (end, TYPE_MAXIMUM (jint)); 6107 end = min (end, TYPE_MAXIMUM (jint));
@@ -6238,7 +6238,7 @@ android_reset_conversion (struct frame *f)
6238 6238
6239 android_reset_ic (FRAME_ANDROID_WINDOW (f), mode); 6239 android_reset_ic (FRAME_ANDROID_WINDOW (f), mode);
6240 6240
6241 /* Clear extracted text flags. Since the IM has been reinitialised, 6241 /* Clear extracted text flags. Since the IM has been reinitialized,
6242 it should no longer be displaying extracted text. */ 6242 it should no longer be displaying extracted text. */
6243 FRAME_ANDROID_OUTPUT (f)->extracted_text_flags = 0; 6243 FRAME_ANDROID_OUTPUT (f)->extracted_text_flags = 0;
6244 6244
diff --git a/src/androidterm.h b/src/androidterm.h
index e75d46b1dfb..9830cc4364d 100644
--- a/src/androidterm.h
+++ b/src/androidterm.h
@@ -262,7 +262,7 @@ struct android_output
262 text''. */ 262 text''. */
263 int extracted_text_flags; 263 int extracted_text_flags;
264 264
265 /* Token asssociated with that request. */ 265 /* Token associated with that request. */
266 int extracted_text_token; 266 int extracted_text_token;
267 267
268 /* The number of characters of extracted text wanted by the IM. */ 268 /* The number of characters of extracted text wanted by the IM. */
diff --git a/src/androidvfs.c b/src/androidvfs.c
index 51558d2a375..3b7fb731e86 100644
--- a/src/androidvfs.c
+++ b/src/androidvfs.c
@@ -407,7 +407,7 @@ android_init_fd_class (JNIEnv *env)
407 values are prohibitively slow, but smaller values can't face up to 407 values are prohibitively slow, but smaller values can't face up to
408 some long file names within several nested layers of directories. 408 some long file names within several nested layers of directories.
409 409
410 Buffers holding components or other similar file name constitutents 410 Buffers holding components or other similar file name constituents
411 which don't represent SAF files must continue to use PATH_MAX, for 411 which don't represent SAF files must continue to use PATH_MAX, for
412 that is the restriction imposed by the Unix file system. */ 412 that is the restriction imposed by the Unix file system. */
413 413
@@ -4179,7 +4179,7 @@ android_saf_stat (const char *uri_name, const char *id_name,
4179} 4179}
4180 4180
4181/* Detect if Emacs has access to the document designated by the the 4181/* Detect if Emacs has access to the document designated by the the
4182 documen ID ID_NAME within the tree URI_NAME. If ID_NAME is NULL, 4182 document ID ID_NAME within the tree URI_NAME. If ID_NAME is NULL,
4183 use the document ID in URI_NAME itself. 4183 use the document ID in URI_NAME itself.
4184 4184
4185 If WRITABLE, also check that the file is writable, which is true 4185 If WRITABLE, also check that the file is writable, which is true
@@ -6427,7 +6427,7 @@ android_root_name (struct android_vnode *vnode, char *name,
6427 if (!component_end) 6427 if (!component_end)
6428 component_end = name + length; 6428 component_end = name + length;
6429 else 6429 else
6430 /* Move past the spearator character. */ 6430 /* Move past the separator character. */
6431 component_end++; 6431 component_end++;
6432 6432
6433 /* Now, find out if the first component is a special vnode; if so, 6433 /* Now, find out if the first component is a special vnode; if so,
@@ -7172,7 +7172,7 @@ android_readlinkat (int dirfd, const char *restrict pathname,
7172 while file streams also require ownership over file descriptors 7172 while file streams also require ownership over file descriptors
7173 they are created on behalf of. 7173 they are created on behalf of.
7174 7174
7175 Detaching the parcel file descriptor linked to FD consequentially 7175 Detaching the parcel file descriptor linked to FD consequently
7176 prevents the owner from being notified when it is eventually 7176 prevents the owner from being notified when it is eventually
7177 closed, but for now that hasn't been demonstrated to be problematic 7177 closed, but for now that hasn't been demonstrated to be problematic
7178 yet, as Emacs doesn't write to file streams. */ 7178 yet, as Emacs doesn't write to file streams. */
diff --git a/src/fileio.c b/src/fileio.c
index 51937e6d765..64f255a355b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -203,7 +203,7 @@ check_vfs_filename (Lisp_Object encoded, const char *reason)
203#ifdef HAVE_LIBSELINUX 203#ifdef HAVE_LIBSELINUX
204 204
205/* Return whether SELinux is enabled and pertinent to FILE. Provide 205/* Return whether SELinux is enabled and pertinent to FILE. Provide
206 for cases where FILE is or is a constitutent of a special 206 for cases where FILE is or is a constituent of a special
207 directory, such as /assets or /content on Android. */ 207 directory, such as /assets or /content on Android. */
208 208
209static bool 209static bool
diff --git a/src/image.c b/src/image.c
index 29ec6d5381b..38744fc1cce 100644
--- a/src/image.c
+++ b/src/image.c
@@ -11785,7 +11785,7 @@ svg_css_length_to_pixels (RsvgLength length, double dpi, int font_size)
11785 11785
11786 If we do set explicit width and height values in the image 11786 If we do set explicit width and height values in the image
11787 spec, this will work out correctly as librsvg will still 11787 spec, this will work out correctly as librsvg will still
11788 honour the percentage sizes in its final rendering no matter 11788 honor the percentage sizes in its final rendering no matter
11789 what size we make the image. */ 11789 what size we make the image. */
11790 value = 0; 11790 value = 0;
11791 break; 11791 break;
diff --git a/src/process.c b/src/process.c
index bde87b78701..8bc922ab509 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7520,7 +7520,7 @@ handle_child_signal (int sig)
7520 7520
7521 emacs_unlink is not async signal safe because 7521 emacs_unlink is not async signal safe because
7522 deleting files from content providers must proceed 7522 deleting files from content providers must proceed
7523 through Java code. Consequentially, if XCDR (head) 7523 through Java code. Consequently, if XCDR (head)
7524 lies on a content provider it will not be removed, 7524 lies on a content provider it will not be removed,
7525 which is a bug. */ 7525 which is a bug. */
7526 unlink (SSDATA (XCDR (head))); 7526 unlink (SSDATA (XCDR (head)));
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index cb4fbd58faa..19bec537130 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -2824,7 +2824,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum)
2824 2824
2825/* Iterate through all the char-matching operations directly reachable from P. 2825/* Iterate through all the char-matching operations directly reachable from P.
2826 This is the inner loop of `forall_firstchar`, which see. 2826 This is the inner loop of `forall_firstchar`, which see.
2827 LOOP_BEG..LOOP_END delimit the currentl "block" of code (we assume 2827 LOOP_BEG..LOOP_END delimit the currently "block" of code (we assume
2828 the code is made of syntactically nested loops). 2828 the code is made of syntactically nested loops).
2829 LOOP_END is blindly assumed to be "safe". 2829 LOOP_END is blindly assumed to be "safe".
2830 To guarantee termination, at each iteration, either LOOP_BEG should 2830 To guarantee termination, at each iteration, either LOOP_BEG should
diff --git a/src/sfnt.c b/src/sfnt.c
index bc2ffdea9dc..238e7f48420 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -4762,7 +4762,7 @@ sfnt_get_scale (struct sfnt_head_table *head, int ppem)
4762 /* Figure out how to convert from font unit-space to pixel space. 4762 /* Figure out how to convert from font unit-space to pixel space.
4763 To turn one unit to its corresponding pixel size given a ppem of 4763 To turn one unit to its corresponding pixel size given a ppem of
4764 1, the unit must be divided by head->units_per_em. Then, it must 4764 1, the unit must be divided by head->units_per_em. Then, it must
4765 be multipled by the ppem. So, 4765 be multiplied by the ppem. So,
4766 4766
4767 PIXEL = UNIT / UPEM * PPEM 4767 PIXEL = UNIT / UPEM * PPEM
4768 4768
@@ -4902,7 +4902,7 @@ sfnt_read_name_table (int fd, struct sfnt_offset_subtable *subtable)
4902 return NULL; 4902 return NULL;
4903 } 4903 }
4904 4904
4905 /* Read REQURIED bytes into the string data. */ 4905 /* Read REQUIRED bytes into the string data. */
4906 name->data = (unsigned char *) (name->name_records 4906 name->data = (unsigned char *) (name->name_records
4907 + name->count); 4907 + name->count);
4908 rc = read (fd, name->data, required); 4908 rc = read (fd, name->data, required);
@@ -14256,7 +14256,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start,
14256 } 14256 }
14257 else 14257 else
14258 { 14258 {
14259 /* ... otheriwse, move point j by the delta of the 14259 /* ... otherwise, move point j by the delta of the
14260 nearest touched point. */ 14260 nearest touched point. */
14261 14261
14262 if (x[j] >= max_pos) 14262 if (x[j] >= max_pos)
@@ -14320,7 +14320,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start,
14320 } 14320 }
14321 else 14321 else
14322 { 14322 {
14323 /* ... otheriwse, move point j by the delta of the 14323 /* ... otherwise, move point j by the delta of the
14324 nearest touched point. */ 14324 nearest touched point. */
14325 14325
14326 if (y[j] >= max_pos) 14326 if (y[j] >= max_pos)
@@ -14404,7 +14404,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start,
14404 } 14404 }
14405 else 14405 else
14406 { 14406 {
14407 /* ... otheriwse, move point j by the delta of the 14407 /* ... otherwise, move point j by the delta of the
14408 nearest touched point. */ 14408 nearest touched point. */
14409 14409
14410 if (x[j] >= max_pos) 14410 if (x[j] >= max_pos)
@@ -14468,7 +14468,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start,
14468 } 14468 }
14469 else 14469 else
14470 { 14470 {
14471 /* ... otheriwse, move point j by the delta of the 14471 /* ... otherwise, move point j by the delta of the
14472 nearest touched point. */ 14472 nearest touched point. */
14473 14473
14474 if (y[j] >= max_pos) 14474 if (y[j] >= max_pos)
@@ -14557,7 +14557,7 @@ sfnt_infer_deltas (struct sfnt_glyph *glyph, bool *touched,
14557 of one or two coordinates for each axis. Each such list is 14557 of one or two coordinates for each axis. Each such list is
14558 referred to as a ``tuple''. 14558 referred to as a ``tuple''.
14559 14559
14560 The deltas, one for each point, are multipled by the normalized 14560 The deltas, one for each point, are multiplied by the normalized
14561 value of each axis and applied to those points for each tuple that 14561 value of each axis and applied to those points for each tuple that
14562 is found to be applicable. 14562 is found to be applicable.
14563 14563
diff --git a/src/sfnt.h b/src/sfnt.h
index f6ab6a6eebd..42ae64c362b 100644
--- a/src/sfnt.h
+++ b/src/sfnt.h
@@ -1283,7 +1283,7 @@ struct sfnt_gvar_table
1283 unsigned char *glyph_variation_data; 1283 unsigned char *glyph_variation_data;
1284}; 1284};
1285 1285
1286/* Structure repesenting a set of axis coordinates and their 1286/* Structure representing a set of axis coordinates and their
1287 normalized equivalents. 1287 normalized equivalents.
1288 1288
1289 To use this structure, call 1289 To use this structure, call
diff --git a/src/sfntfont.c b/src/sfntfont.c
index 68e850779fc..f002712dc10 100644
--- a/src/sfntfont.c
+++ b/src/sfntfont.c
@@ -1348,7 +1348,7 @@ sfntfont_charset_for_cmap (struct sfnt_cmap_encoding_subtable subtable)
1348 subtable in *SUBTABLE upon success, NULL otherwise. 1348 subtable in *SUBTABLE upon success, NULL otherwise.
1349 1349
1350 If FORMAT14 is non-NULL, return any associated format 14 variation 1350 If FORMAT14 is non-NULL, return any associated format 14 variation
1351 selection context in *FORMAT14 should the selected charcter map be 1351 selection context in *FORMAT14 should the selected character map be
1352 a Unicode character map. */ 1352 a Unicode character map. */
1353 1353
1354static struct sfnt_cmap_encoding_subtable_data * 1354static struct sfnt_cmap_encoding_subtable_data *
@@ -1371,7 +1371,7 @@ sfntfont_select_cmap (struct sfnt_cmap_table *cmap,
1371 if (!format14) 1371 if (!format14)
1372 return data[i]; 1372 return data[i];
1373 1373
1374 /* Search for a correspoinding format 14 character map. 1374 /* Search for a corresponding format 14 character map.
1375 This is used in conjunction with the selected character 1375 This is used in conjunction with the selected character
1376 map to map variation sequences. */ 1376 map to map variation sequences. */
1377 1377
@@ -1400,7 +1400,7 @@ sfntfont_select_cmap (struct sfnt_cmap_table *cmap,
1400 if (!format14) 1400 if (!format14)
1401 return data[i]; 1401 return data[i];
1402 1402
1403 /* Search for a correspoinding format 14 character map. 1403 /* Search for a corresponding format 14 character map.
1404 This is used in conjunction with the selected character 1404 This is used in conjunction with the selected character
1405 map to map variation sequences. */ 1405 map to map variation sequences. */
1406 1406
diff --git a/src/textconv.c b/src/textconv.c
index bd72562317f..fb1c66bb2c2 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
23 They may then request that the text editor remove or substitute 23 They may then request that the text editor remove or substitute
24 that text for something else, for example when providing the 24 that text for something else, for example when providing the
25 ability to ``undo'' or ``edit'' previously composed text. This is 25 ability to ``undo'' or ``edit'' previously composed text. This is
26 most commonly seen in input methods for CJK laguages for X Windows, 26 most commonly seen in input methods for CJK languages for X Windows,
27 and is extensively used throughout Android by input methods for all 27 and is extensively used throughout Android by input methods for all
28 kinds of scripts. 28 kinds of scripts.
29 29
@@ -1311,7 +1311,7 @@ struct complete_edit_check_context
1311 1311
1312/* Convert PTR to CONTEXT. If CONTEXT->check is false, then update 1312/* Convert PTR to CONTEXT. If CONTEXT->check is false, then update
1313 CONTEXT->w's ephemeral last point and give it to the input method, 1313 CONTEXT->w's ephemeral last point and give it to the input method,
1314 the assumption being that an editing operation signalled. */ 1314 the assumption being that an editing operation signaled. */
1315 1315
1316static void 1316static void
1317complete_edit_check (void *ptr) 1317complete_edit_check (void *ptr)
@@ -1379,7 +1379,7 @@ handle_pending_conversion_events_1 (struct frame *f,
1379 or not the editing operation completed successfully. */ 1379 or not the editing operation completed successfully. */
1380 context.check = false; 1380 context.check = false;
1381 1381
1382 /* Make sure completion is signalled. */ 1382 /* Make sure completion is signaled. */
1383 count = SPECPDL_INDEX (); 1383 count = SPECPDL_INDEX ();
1384 record_unwind_protect_ptr (complete_edit, &token); 1384 record_unwind_protect_ptr (complete_edit, &token);
1385 w = NULL; 1385 w = NULL;
diff --git a/src/treesit.c b/src/treesit.c
index 69b59fca111..912f4ed47cc 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -3335,7 +3335,7 @@ treesit_traverse_validate_predicate (Lisp_Object pred,
3335 if (!CONSP (cdr)) 3335 if (!CONSP (cdr))
3336 { 3336 {
3337 *signal_data = list3 (Qtreesit_invalid_predicate, 3337 *signal_data = list3 (Qtreesit_invalid_predicate,
3338 build_string ("Invalide `not' " 3338 build_string ("Invalid `not' "
3339 "predicate"), 3339 "predicate"),
3340 pred); 3340 pred);
3341 return false; 3341 return false;
diff --git a/src/window.h b/src/window.h
index 9ef8434af18..346dc70ea98 100644
--- a/src/window.h
+++ b/src/window.h
@@ -292,7 +292,7 @@ struct window
292 292
293 `last_point' is normally used during redisplay to indicate the 293 `last_point' is normally used during redisplay to indicate the
294 position of point as seem by the input method. However, it is 294 position of point as seem by the input method. However, it is
295 not updated if consequtive conversions are processed at the 295 not updated if consecutive conversions are processed at the
296 same time. 296 same time.
297 297
298 This `ephemeral_last_point' field is either the last point as 298 This `ephemeral_last_point' field is either the last point as
diff --git a/src/xselect.c b/src/xselect.c
index c38a1f8b6a9..5ffa0fd24fc 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -897,7 +897,7 @@ x_start_selection_transfer (struct x_display_info *dpyinfo, Window requestor,
897 897
898 /* Find a valid (non-zero) serial for the selection transfer. 898 /* Find a valid (non-zero) serial for the selection transfer.
899 Any asynchronously trapped errors will then cause the 899 Any asynchronously trapped errors will then cause the
900 selection transfer to be cancelled. */ 900 selection transfer to be canceled. */
901 transfer->serial = (++selection_serial 901 transfer->serial = (++selection_serial
902 ? selection_serial 902 ? selection_serial
903 : ++selection_serial); 903 : ++selection_serial);
diff --git a/src/xterm.c b/src/xterm.c
index 75ac8d0d555..79648a6d6e5 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -616,9 +616,9 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
616 - x_clear_errors 616 - x_clear_errors
617 617
618 Callers using this set should consult the comment(s) on top of the 618 Callers using this set should consult the comment(s) on top of the
619 aformentioned functions. They should not be used when the requests 619 aforementioned functions. They should not be used when the requests
620 being made do not require roundtrips to the X server, and obtaining 620 being made do not require roundtrips to the X server, and obtaining
621 the details of any error generated is unecessary, as 621 the details of any error generated is unnecessary, as
622 `x_uncatch_errors' will always synchronize with the X server, which 622 `x_uncatch_errors' will always synchronize with the X server, which
623 is a potentially slow operation. */ 623 is a potentially slow operation. */
624 624
@@ -5173,7 +5173,7 @@ record_event (char *locus, int type)
5173 5173
5174 5174
5175 5175
5176/* Miscelaneous event handling functions. */ 5176/* Miscellaneous event handling functions. */
5177 5177
5178static void 5178static void
5179x_toolkit_position (struct frame *f, int x, int y, 5179x_toolkit_position (struct frame *f, int x, int y,
@@ -11296,7 +11296,7 @@ x_clear_frame (struct frame *f)
11296 11296
11297/* Send a message to frame F telling the event loop to track whether 11297/* Send a message to frame F telling the event loop to track whether
11298 or not an hourglass is being displayed. This is required to ignore 11298 or not an hourglass is being displayed. This is required to ignore
11299 the right events when the hourglass is mapped without callig XSync 11299 the right events when the hourglass is mapped without calling XSync
11300 after displaying or hiding the hourglass. */ 11300 after displaying or hiding the hourglass. */
11301 11301
11302static void 11302static void
@@ -32094,7 +32094,7 @@ x_initialize (void)
32094 32094
32095#ifdef HAVE_X_I18N 32095#ifdef HAVE_X_I18N
32096 32096
32097/* Notice that a change has occured on F that requires its input 32097/* Notice that a change has occurred on F that requires its input
32098 method state to be reset. */ 32098 method state to be reset. */
32099 32099
32100static void 32100static void