diff options
| author | Paul Eggert | 2019-12-09 18:44:35 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-12-09 18:45:18 -0800 |
| commit | d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc (patch) | |
| tree | fb415df3de5b00b9ce7616872ead40c983b55a12 /src | |
| parent | 28578f87b52ead4d31479fdcfba028118dfa6987 (diff) | |
| download | emacs-d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc.tar.gz emacs-d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc.zip | |
Spelling fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/coding.c | 8 | ||||
| -rw-r--r-- | src/frame.c | 4 | ||||
| -rw-r--r-- | src/hbfont.c | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 28 | ||||
| -rw-r--r-- | src/window.h | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/src/coding.c b/src/coding.c index 5f477cf9473..d9964908dce 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7333,7 +7333,7 @@ produce_annotation (struct coding_system *coding, ptrdiff_t pos) | |||
| 7333 | the text from the end of the gap (and GPT must be equal to PT). | 7333 | the text from the end of the gap (and GPT must be equal to PT). |
| 7334 | 7334 | ||
| 7335 | When the text is taken from the gap, it can't be at the beginning | 7335 | When the text is taken from the gap, it can't be at the beginning |
| 7336 | of the gap because the new decoded text is progressively acumulated | 7336 | of the gap because the new decoded text is progressively accumulated |
| 7337 | at the beginning of the gap before it gets inserted at PT (this way, | 7337 | at the beginning of the gap before it gets inserted at PT (this way, |
| 7338 | as the output grows, the input shrinks, so we only need to allocate | 7338 | as the output grows, the input shrinks, so we only need to allocate |
| 7339 | enough space for `max(IN, OUT)` instead of `IN + OUT`). | 7339 | enough space for `max(IN, OUT)` instead of `IN + OUT`). |
| @@ -9876,7 +9876,7 @@ encode_string_utf_8 (Lisp_Object string, Lisp_Object buffer, | |||
| 9876 | pure-ASCII; only use NOCOPY non-zero if the caller will only use | 9876 | pure-ASCII; only use NOCOPY non-zero if the caller will only use |
| 9877 | the byte sequence of the decoded result accessed via SDATA or | 9877 | the byte sequence of the decoded result accessed via SDATA or |
| 9878 | SSDATA, and if the original STRING will _not_ be modified after the | 9878 | SSDATA, and if the original STRING will _not_ be modified after the |
| 9879 | decoding. When in dount, always pass NOCOPY as zero. You _have_ | 9879 | decoding. When in doubt, always pass NOCOPY as zero. You _have_ |
| 9880 | been warned! | 9880 | been warned! |
| 9881 | 9881 | ||
| 9882 | If STRING is Qnil, and the original string is passed via STR, NOCOPY | 9882 | If STRING is Qnil, and the original string is passed via STR, NOCOPY |
| @@ -10180,7 +10180,7 @@ DEFUN ("internal-encode-string-utf-8", Finternal_encode_string_utf_8, | |||
| 10180 | int repeat_count; | 10180 | int repeat_count; |
| 10181 | Lisp_Object val; | 10181 | Lisp_Object val; |
| 10182 | 10182 | ||
| 10183 | /* Check arguments. Return Qnil when an argmement is invalid. */ | 10183 | /* Check arguments. Return Qnil when an argument is invalid. */ |
| 10184 | if (! STRINGP (string)) | 10184 | if (! STRINGP (string)) |
| 10185 | return Qnil; | 10185 | return Qnil; |
| 10186 | if (! NILP (buffer) | 10186 | if (! NILP (buffer) |
| @@ -10236,7 +10236,7 @@ DEFUN ("internal-decode-string-utf-8", Finternal_decode_string_utf_8, | |||
| 10236 | int repeat_count; | 10236 | int repeat_count; |
| 10237 | Lisp_Object val; | 10237 | Lisp_Object val; |
| 10238 | 10238 | ||
| 10239 | /* Check arguments. Return Qnil when an argmement is invalid. */ | 10239 | /* Check arguments. Return Qnil when an argument is invalid. */ |
| 10240 | if (! STRINGP (string)) | 10240 | if (! STRINGP (string)) |
| 10241 | return Qnil; | 10241 | return Qnil; |
| 10242 | if (! NILP (buffer) | 10242 | if (! NILP (buffer) |
diff --git a/src/frame.c b/src/frame.c index 486d025e6d6..5468920c357 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -3560,7 +3560,7 @@ window managers may refuse to honor a HEIGHT that is not an integer | |||
| 3560 | multiple of the default frame font height. | 3560 | multiple of the default frame font height. |
| 3561 | 3561 | ||
| 3562 | When called interactively, HEIGHT is the numeric prefix and the | 3562 | When called interactively, HEIGHT is the numeric prefix and the |
| 3563 | currenly selected frame will be set to this height. */) | 3563 | currently selected frame will be set to this height. */) |
| 3564 | (Lisp_Object frame, Lisp_Object height, Lisp_Object pretend, Lisp_Object pixelwise) | 3564 | (Lisp_Object frame, Lisp_Object height, Lisp_Object pretend, Lisp_Object pixelwise) |
| 3565 | { | 3565 | { |
| 3566 | struct frame *f = decode_live_frame (frame); | 3566 | struct frame *f = decode_live_frame (frame); |
| @@ -3589,7 +3589,7 @@ window managers may refuse to honor a WIDTH that is not an integer | |||
| 3589 | multiple of the default frame font width. | 3589 | multiple of the default frame font width. |
| 3590 | 3590 | ||
| 3591 | When called interactively, WIDTH is the numeric prefix and the | 3591 | When called interactively, WIDTH is the numeric prefix and the |
| 3592 | currenly selected frame will be set to this width. */) | 3592 | currently selected frame will be set to this width. */) |
| 3593 | (Lisp_Object frame, Lisp_Object width, Lisp_Object pretend, Lisp_Object pixelwise) | 3593 | (Lisp_Object frame, Lisp_Object width, Lisp_Object pretend, Lisp_Object pixelwise) |
| 3594 | { | 3594 | { |
| 3595 | struct frame *f = decode_live_frame (frame); | 3595 | struct frame *f = decode_live_frame (frame); |
diff --git a/src/hbfont.c b/src/hbfont.c index db10f92e313..5a057c26a1d 100644 --- a/src/hbfont.c +++ b/src/hbfont.c | |||
| @@ -541,7 +541,7 @@ hbfont_shape (Lisp_Object lgstring, Lisp_Object direction) | |||
| 541 | 541 | ||
| 542 | Implementation note: the character codepoint recorded in | 542 | Implementation note: the character codepoint recorded in |
| 543 | each glyph is not really used, except when we display the | 543 | each glyph is not really used, except when we display the |
| 544 | glyphs in descr-text.el. So this is just an aeasthetic | 544 | glyphs in descr-text.el. So this is just an aesthetic |
| 545 | issue. */ | 545 | issue. */ |
| 546 | if (buf_reversed) | 546 | if (buf_reversed) |
| 547 | cluster_offset = to - from; | 547 | cluster_offset = to - from; |
diff --git a/src/nsterm.m b/src/nsterm.m index 52a9830be82..493807b2a45 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -9432,8 +9432,8 @@ syms_of_nsterm (void) | |||
| 9432 | 9432 | ||
| 9433 | DEFVAR_LISP ("ns-alternate-modifier", ns_alternate_modifier, | 9433 | DEFVAR_LISP ("ns-alternate-modifier", ns_alternate_modifier, |
| 9434 | "This variable describes the behavior of the alternate or option key.\n\ | 9434 | "This variable describes the behavior of the alternate or option key.\n\ |
| 9435 | Either SYMBOL, describing the behaviour for any event,\n\ | 9435 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9436 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9436 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9437 | separately for ordinary keys, function keys, and mouse events.\n\ | 9437 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9438 | \n\ | 9438 | \n\ |
| 9439 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9439 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
| @@ -9442,8 +9442,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9442 | 9442 | ||
| 9443 | DEFVAR_LISP ("ns-right-alternate-modifier", ns_right_alternate_modifier, | 9443 | DEFVAR_LISP ("ns-right-alternate-modifier", ns_right_alternate_modifier, |
| 9444 | "This variable describes the behavior of the right alternate or option key.\n\ | 9444 | "This variable describes the behavior of the right alternate or option key.\n\ |
| 9445 | Either SYMBOL, describing the behaviour for any event,\n\ | 9445 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9446 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9446 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9447 | separately for ordinary keys, function keys, and mouse events.\n\ | 9447 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9448 | It can also be `left' to use the value of `ns-alternate-modifier' instead.\n\ | 9448 | It can also be `left' to use the value of `ns-alternate-modifier' instead.\n\ |
| 9449 | \n\ | 9449 | \n\ |
| @@ -9453,8 +9453,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9453 | 9453 | ||
| 9454 | DEFVAR_LISP ("ns-command-modifier", ns_command_modifier, | 9454 | DEFVAR_LISP ("ns-command-modifier", ns_command_modifier, |
| 9455 | "This variable describes the behavior of the command key.\n\ | 9455 | "This variable describes the behavior of the command key.\n\ |
| 9456 | Either SYMBOL, describing the behaviour for any event,\n\ | 9456 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9457 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9457 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9458 | separately for ordinary keys, function keys, and mouse events.\n\ | 9458 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9459 | \n\ | 9459 | \n\ |
| 9460 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9460 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
| @@ -9463,8 +9463,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9463 | 9463 | ||
| 9464 | DEFVAR_LISP ("ns-right-command-modifier", ns_right_command_modifier, | 9464 | DEFVAR_LISP ("ns-right-command-modifier", ns_right_command_modifier, |
| 9465 | "This variable describes the behavior of the right command key.\n\ | 9465 | "This variable describes the behavior of the right command key.\n\ |
| 9466 | Either SYMBOL, describing the behaviour for any event,\n\ | 9466 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9467 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9467 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9468 | separately for ordinary keys, function keys, and mouse events.\n\ | 9468 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9469 | It can also be `left' to use the value of `ns-command-modifier' instead.\n\ | 9469 | It can also be `left' to use the value of `ns-command-modifier' instead.\n\ |
| 9470 | \n\ | 9470 | \n\ |
| @@ -9474,8 +9474,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9474 | 9474 | ||
| 9475 | DEFVAR_LISP ("ns-control-modifier", ns_control_modifier, | 9475 | DEFVAR_LISP ("ns-control-modifier", ns_control_modifier, |
| 9476 | "This variable describes the behavior of the control key.\n\ | 9476 | "This variable describes the behavior of the control key.\n\ |
| 9477 | Either SYMBOL, describing the behaviour for any event,\n\ | 9477 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9478 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9478 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9479 | separately for ordinary keys, function keys, and mouse events.\n\ | 9479 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9480 | \n\ | 9480 | \n\ |
| 9481 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9481 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
| @@ -9484,8 +9484,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9484 | 9484 | ||
| 9485 | DEFVAR_LISP ("ns-right-control-modifier", ns_right_control_modifier, | 9485 | DEFVAR_LISP ("ns-right-control-modifier", ns_right_control_modifier, |
| 9486 | "This variable describes the behavior of the right control key.\n\ | 9486 | "This variable describes the behavior of the right control key.\n\ |
| 9487 | Either SYMBOL, describing the behaviour for any event,\n\ | 9487 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9488 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9488 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9489 | separately for ordinary keys, function keys, and mouse events.\n\ | 9489 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9490 | It can also be `left' to use the value of `ns-control-modifier' instead.\n\ | 9490 | It can also be `left' to use the value of `ns-control-modifier' instead.\n\ |
| 9491 | \n\ | 9491 | \n\ |
| @@ -9495,8 +9495,8 @@ If `none', the key is ignored by Emacs and retains its standard meaning."); | |||
| 9495 | 9495 | ||
| 9496 | DEFVAR_LISP ("ns-function-modifier", ns_function_modifier, | 9496 | DEFVAR_LISP ("ns-function-modifier", ns_function_modifier, |
| 9497 | "This variable describes the behavior of the function (fn) key.\n\ | 9497 | "This variable describes the behavior of the function (fn) key.\n\ |
| 9498 | Either SYMBOL, describing the behaviour for any event,\n\ | 9498 | Either SYMBOL, describing the behavior for any event,\n\ |
| 9499 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behaviour\n\ | 9499 | or (:ordinary SYMBOL :function SYMBOL :mouse SYMBOL), describing behavior\n\ |
| 9500 | separately for ordinary keys, function keys, and mouse events.\n\ | 9500 | separately for ordinary keys, function keys, and mouse events.\n\ |
| 9501 | \n\ | 9501 | \n\ |
| 9502 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ | 9502 | Each SYMBOL is `control', `meta', `alt', `super', `hyper' or `none'.\n\ |
diff --git a/src/window.h b/src/window.h index 5b9a3140c8f..6dbeae1fecc 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -429,7 +429,7 @@ struct window | |||
| 429 | i.e., always survive Fset_window_buffer. */ | 429 | i.e., always survive Fset_window_buffer. */ |
| 430 | bool_bf fringes_persistent : 1; | 430 | bool_bf fringes_persistent : 1; |
| 431 | 431 | ||
| 432 | /* True if this window's croll bar specifications are persistent, | 432 | /* True if this window's scroll bar specifications are persistent, |
| 433 | i.e., always survive Fset_window_buffer. */ | 433 | i.e., always survive Fset_window_buffer. */ |
| 434 | bool_bf scroll_bars_persistent : 1; | 434 | bool_bf scroll_bars_persistent : 1; |
| 435 | 435 | ||