From: Stefan Kangas Date: Fri, 3 Sep 2021 09:13:53 +0000 (+0200) Subject: ; Fix typos X-Git-Tag: emacs-28.0.90~1201 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0cabf8bc363cdeace84523b251752c0aac32b31b;p=emacs.git ; Fix typos --- diff --git a/ChangeLog.2 b/ChangeLog.2 index 7b40c54dc64..3e227675e0d 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -35670,7 +35670,7 @@ 2015-04-08 Artur Malabarba * lisp/emacs-lisp/package.el (package-menu-mode): Mode-line notification - while dowloading information. + while downloading information. * lisp/emacs-lisp/package.el: More conservative `ensure-init-file' (package--ensure-init-file): Check file contents before visiting. diff --git a/ChangeLog.3 b/ChangeLog.3 index 8b872a0726e..9ec19e91d7f 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -33355,9 +33355,9 @@ Fix the handling of font backend supersedence on MS-Windows * src/w32font.c (syms_of_w32font): Don't make the Uniscribe - font backend "superceded" here, ... + font backend "superseded" here, ... * src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): - ... make it "superceded" here, only if the HarfBuzz DLL was + ... make it "superseded" here, only if the HarfBuzz DLL was successfully loaded. This is because Emacs compiled with HarfBuzz support might run on a system without the DLL. * src/w32fns.c (Fx_create_frame, w32_create_tip_frame): @@ -36933,7 +36933,7 @@ electric--sort-post-self-insertion-hook. * lisp/emacs-lisp/syntax.el (syntax-propertize, syntax-ppss): - Use new `depth` arg to make sure noone accidentally gets added + Use new `depth` arg to make sure no one accidentally gets added after syntax-ppss-flush-cache. * doc/lispref/modes.texi (Setting Hooks): Document new `depth` arg. @@ -58138,7 +58138,7 @@ Use bignums when Emacs converts to and from system types like off_t for file sizes whose values can exceed fixnum range. - Formerly, Emacs sometimes generted floats and sometimes ad-hoc + Formerly, Emacs sometimes generated floats and sometimes ad-hoc conses of integers. Emacs still accepts floats and conses for these system types, in case some stray Lisp code is generating them, though this usage is obsolescent. @@ -133272,7 +133272,7 @@ (g_b_init_compare_string_w): Move declaration to file scope. * src/w32heap.c (dumped_data_commit): Now static. (FREEABLE_P): Avoid warnings about pointer comparison with integer. - (mmap_realloc): Cast to 'char *' for arithmetics on void pointers. + (mmap_realloc): Cast to 'char *' for arithmetic on void pointers. * src/w32console.c (ctrl_c_handler, sys_tputs, sys_tgetstr) (evalcost, cmputc, cmcheckmagic, cmcostinit, cmgoto, Wcm_clear): Provide prototypes. @@ -144146,7 +144146,7 @@ Move package test files to new directory. - * test/lisp/emacs-lisp/package-tests.el: Update resoruce file location. + * test/lisp/emacs-lisp/package-tests.el: Update resource file location. * test/data/package: Moved to test/lisp/emacs-lisp/package-resources 2015-11-24 Phillip Lord diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index 7bc6ea6a9e5..4c3a52af6a7 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh @@ -134,7 +134,7 @@ while getopts "gb:hnsiV:" opt; do echo " -g git update and worktree only" echo " -i build installer only" echo " -n do not configure" - echo " -s snaphot build" + echo " -s snapshot build" exit 0 ;; \?) diff --git a/configure.ac b/configure.ac index 6d204b61030..418a62fd5ea 100644 --- a/configure.ac +++ b/configure.ac @@ -5667,7 +5667,7 @@ gl_INIT CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS -# timer_getoverrun needs the same libarary as timer_settime +# timer_getoverrun needs the same library as timer_settime OLD_LIBS=$LIBS LIBS="$LIB_TIMER_TIME $LIBS" AC_CHECK_FUNCS(timer_getoverrun) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 7ab2896778d..ca438c10ce2 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5970,7 +5970,7 @@ To @var{svg} add an embedded (raster) image placed at @code{:base-uri} specifies a (possibly non-existing) file name of the svg image to be created, thus all the embedded files are searched relatively to the @code{:base-uri} filename's directory. If -@code{:base-uri} is ommited, then filename from where svg image is +@code{:base-uri} is omitted, then filename from where svg image is loaded is used. Using @code{:base-uri} improves the performance of embedding large images, comparing to @code{svg-embed}, because all the work is done directly by librsvg. diff --git a/etc/NEWS b/etc/NEWS index 0fe988a19ce..3fede93eae6 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3181,7 +3181,7 @@ refers to the old state at FROM. +++ ** 'overlays-in' now handles zero-length overlays slightly differently. -Previosly, zero-length overlays at the end of the buffer were included +Previously, zero-length overlays at the end of the buffer were included in the result (if the region queried for stopped at that position). The same was not the case if the buffer had been narrowed to exclude the real end of the buffer. This has now been changed, and diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index c9d96788c5d..5c12dbfbf57 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -679,7 +679,7 @@ Napisz \kbd{F10} aby uaktywni/c menu w minibuforze. \key{przestaw {\bf linie}}{C-x C-t} \key{przestaw {\bf s-wyra/zenia}}{C-M-t} -% Removed -- there is no Polish disctionary for ispell. +% Removed -- there is no Polish dictionary for ispell. %\section{Spelling Check} % %\key{check spelling of current word}{M-\$} diff --git a/lib-src/etags.c b/lib-src/etags.c index 88b49f803e9..bd4d4fcf53a 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -6259,7 +6259,7 @@ test_objc_is_mercury (char *this_file, language **lang) } } - /* Fallback heuristic test. Not failsafe but errless in pratice. */ + /* Fallback heuristic test. Not failsafe but errless in practice. */ ratio = ((float) rule_signs + percentage_signs + mercury_dots) / lines; out: diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 3de3f2f1571..3dd8313c6a3 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -15867,7 +15867,7 @@ the key line of an entry. * bibtex.el (bibtex-autokey-year-use-crossref-entry): New variable - to determine if crossreferenced entry should be used for autokey + to determine if cross-referenced entry should be used for autokey generation, if year field of current entry is absent. (bibtex-generate-autokey): Use this new variable. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index 3027463e539..39e757bfff1 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -1147,7 +1147,7 @@ (bibtex-submit-bug-report): Use bibtex-version and bibtex-maintainer-salutation. (bibtex-entry-field-alist): Made booktitle field optional for - @inproceedings entries when crossreferenced. + @inproceedings entries when cross-referenced. (bibtex-entry-field-alist): Add booktitle field to proceedings entry type (for cross referencing). Thanks to Wagner Toledo Correa for the suggestion. diff --git a/lisp/bookmark.el b/lisp/bookmark.el index ff9b8ab1388..b340d379b3f 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -27,7 +27,7 @@ ;; associates a string with a location in a certain file. Thus, you ;; can navigate your way to that location by providing the string. ;; -;; Type `M-x customize-group RET boomark RET' for user options. +;; Type `M-x customize-group RET bookmark RET' for user options. ;;; Code: diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index 3c5578217aa..6a3f6046d1c 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -152,7 +152,7 @@ Integer values are handled in the `range' slot.") (defun comp-cstrs-homogeneous (cstrs) "Check if constraints CSTRS are all homogeneously negated or non-negated. Return `pos' if they are all positive, `neg' if they are all -negated or nil othewise." +negated or nil otherwise." (cl-loop for cstr in cstrs unless (comp-cstr-neg cstr) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 0522b31f577..b95f11eab64 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -79,7 +79,7 @@ of the alist has the form (KEY FUNCTION HELP), where KEY is a character; FUNCTION is a function of one argument (an object from LIST); and HELP is a string. When the user presses KEY, FUNCTION is called; if it returns non-nil, the object is considered to have been \"acted upon\", -and `map-y-or-n-p' proceeeds to the next object from LIST. If +and `map-y-or-n-p' proceeds to the next object from LIST. If FUNCTION returns nil, the prompt is re-issued for the same object: this comes in handy if FUNCTION produces some display that will allow the user to make an intelligent decision whether the object in question diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 73202016ba7..e0fda41f8ed 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2271,7 +2271,7 @@ first element is the certificate key file name, and the second element is the certificate file name itself, or t, which means that `auth-source' will be queried for the key and the certificate. Authenticating using a TLS client certificate is -also refered to as \"CertFP\" (Certificate Fingerprint) +also referred to as \"CertFP\" (Certificate Fingerprint) authentication by various IRC networks. Example usage: diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index f3e3590645b..feb75a198e2 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el @@ -145,7 +145,7 @@ and HANKAKU belongs to `japanese-jisx0201-kana'.") (?ｐ . ?p) (?ｑ . ?q) (?ｒ . ?r) (?ｓ . ?s) (?ｔ . ?t) (?ｕ . ?u) (?ｖ . ?v) (?ｗ . ?w) (?ｘ . ?x) (?ｙ . ?y) (?ｚ . ?z)) "Japanese JISX0208 alpha numeric character table. -Each element is of the form (ALPHA-NUMERIC . ASCII), where ALPHA-NUMERIC +Each element is of the form (ALPHANUMERIC . ASCII), where ALPHANUMERIC belongs to `japanese-jisx0208', ASCII belongs to `ascii'.") ;; Put properties 'jisx0208 and 'ascii to each Japanese alpha numeric diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el index f33cbaf1126..0f42af0911b 100644 --- a/lisp/net/dictionary.el +++ b/lisp/net/dictionary.el @@ -86,7 +86,7 @@ You can specify here: (defcustom dictionary-port 2628 "The port of the dictionary server. -This port is propably always 2628 so there should be no need to modify it." +This port is probably always 2628 so there should be no need to modify it." :group 'dictionary :set #'dictionary-set-server-var :type 'number diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 334e82114fc..f1bc25db7f7 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -658,7 +658,7 @@ ;; prevent a repeat invocation. See elisp/lispref page "Search-based ;; Fontification". ;; - ;; This function gives invalid GAWK namepace separators (::) + ;; This function gives invalid GAWK namespace separators (::) ;; font-lock-warning-face. "Invalid" here means there are spaces, etc., ;; around a separator, or there are more than one of them in an identifier. ;; Invalid separators inside function declaration parentheses are handled diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index c305cae754e..77da98f6262 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -7422,7 +7422,7 @@ multi-line strings (but not C++, for example)." t) (save-excursion (goto-char (match-end 1)) - (if (c-in-literal) ; a psuedo closer. + (if (c-in-literal) ; a pseudo closer. t (setq saved-match-data (match-data)) (setq found t) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 542f8ad0b1b..ef36c1f0877 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -1452,7 +1452,7 @@ Elisp eldoc behaviour. Consider variable docstrings and function signatures only, in this order. If none applies, returns nil. Changes to `eldoc-documentation-functions' and `eldoc-documentation-strategy' are _not_ reflected here. As such -it is preferrable to use ElDoc's interfaces directly.") +it is preferable to use ElDoc's interfaces directly.") (make-obsolete 'elisp-eldoc-documentation-function "use ElDoc's interfaces instead." "28.1") diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 4a1da62c7e9..a2f5d7286ac 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -682,7 +682,7 @@ that form should be displayed.") (defconst hif-valid-token-list (mapcar 'cdr hif-token-alist)) (defconst hif-token-regexp - ;; The ordering of regexp grouping is crutial to `hif-strtok' + ;; The ordering of regexp grouping is crucial to `hif-strtok' (concat ;; hex/binary: "\\([+-]?0[xXbB]\\([[:xdigit:]']+\\)?\\.?\\([[:xdigit:]']+\\)?\\([pP]\\([+-]?[0-9]+\\)\\)?" diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 5eeac8af3b8..3fe67fabf19 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4700,7 +4700,7 @@ Usage: `vhdl-project-alist'. - SPECIAL MENUES: + SPECIAL MENUS: As an alternative to the speedbar, an index menu can be added (set option `vhdl-index-menu' to non-nil) or made accessible as a mouse menu (e.g. add \"(global-set-key [S-down-mouse-3] \\='imenu)\" to your start-up diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 5cece1aa3c6..d5671ce14f9 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -113,7 +113,7 @@ page-dashes Change double dashes in page field to single dash whitespace Delete whitespace at the beginning and end of fields. inherit-booktitle If entry contains a crossref field and the booktitle field is empty, set the booktitle field to the content - of the title field of the crossreferenced entry. + of the title field of the cross-referenced entry. realign Realign entries, so that field texts and perhaps equal signs (depending on the value of `bibtex-align-at-equal-sign') begin in the same column. @@ -1228,9 +1228,9 @@ See `bibtex-generate-autokey' for details." :type 'integer) (defcustom bibtex-autokey-use-crossref t - "If non-nil use fields from crossreferenced entry if necessary. + "If non-nil use fields from cross-referenced entry if necessary. If this variable is non-nil and some field has no entry, but a -valid crossref entry, the field from the crossreferenced entry is used. +valid crossref entry, the field from the cross-referenced entry is used. See `bibtex-generate-autokey' for details." :group 'bibtex-autokey :type 'boolean) @@ -2975,7 +2975,7 @@ The year part: `bibtex-autokey-year-length' digits (useful values are 2 and 4). 2. If both the year and date fields are absent, but the entry has a valid crossref field and `bibtex-autokey-use-crossref' is - non-nil, use the date or year field of the crossreferenced entry + non-nil, use the date or year field of the cross-referenced entry instead. The title part diff --git a/lisp/windmove.el b/lisp/windmove.el index f747c409431..ef970bb6c96 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -170,7 +170,7 @@ placement bugs in old versions of Emacs." (defcustom windmove-allow-all-windows nil "Whether the windmove commands are allowed to target all type of windows. -If this variable is set to non-nil, all windmove commmands will +If this variable is set to non-nil, all windmove commands will ignore the `no-other-window' parameter applied by `display-buffer-alist' or `set-window-parameter'." :type 'boolean diff --git a/src/fns.c b/src/fns.c index 5126439fd66..c39fce21c70 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1174,7 +1174,7 @@ string_make_multibyte (Lisp_Object string) /* Convert STRING (if unibyte) to a multibyte string without changing - the number of characters. Characters 0200 trough 0237 are + the number of characters. Characters 0200 through 0237 are converted to eight-bit characters. */ Lisp_Object diff --git a/src/frame.c b/src/frame.c index ab5dcc3664c..f95566818af 100644 --- a/src/frame.c +++ b/src/frame.c @@ -729,7 +729,7 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height, && (f->new_width >= 0 || f->new_height >= 0)) /* For implied resizes with inhibit 2 (external menu and tool bar) pick up any new sizes the display engine has not - processed yet. Otherwsie, we would request the old sizes + processed yet. Otherwise, we would request the old sizes which will make this request appear as a request to set new sizes and have the WM react accordingly which is not TRT. diff --git a/src/image.c b/src/image.c index bcd45eb4514..206c7baa2f8 100644 --- a/src/image.c +++ b/src/image.c @@ -10039,7 +10039,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, #if LIBRSVG_CHECK_VERSION (2, 46, 0) RsvgRectangle zero_rect, viewbox, out_logical_rect; - /* Try the instrinsic dimensions first. */ + /* Try the intrinsic dimensions first. */ gboolean has_width, has_height, has_viewbox; RsvgLength iwidth, iheight; double dpi = FRAME_DISPLAY_INFO (f)->resx; @@ -10074,7 +10074,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, } else { - /* We haven't found a useable set of sizes, so try working out + /* We haven't found a usable set of sizes, so try working out the visible area. */ rsvg_handle_get_geometry_for_layer (rsvg_handle, NULL, &zero_rect, &viewbox, diff --git a/src/nsterm.m b/src/nsterm.m index 4bdc67c10b5..8d88f7bd3de 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -8369,14 +8369,14 @@ not_in_argv (NSString *arg) #ifdef NS_IMPL_COCOA - /* We have to set the accesibility subroles and/or the collection + /* We have to set the accessibility subroles and/or the collection behaviors early otherwise child windows may not go fullscreen as expected later. */ #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 if ([child respondsToSelector:@selector(setAccessibilitySubrole:)]) #endif - /* Set the accessibilty subroles. */ + /* Set the accessibility subroles. */ if (parentFrame) [self setAccessibilitySubrole:NSAccessibilityFloatingWindowSubrole]; else diff --git a/test/lisp/net/socks-tests.el b/test/lisp/net/socks-tests.el index 71bdd74890a..c0f90bc2d47 100644 --- a/test/lisp/net/socks-tests.el +++ b/test/lisp/net/socks-tests.el @@ -95,7 +95,7 @@ ;; From fedora.org: 2605:bc80:3010:600:dead:beef:cafe:fed9 ;; 5004 ~~> Version Status (OK) NOOP Addr-Type (4 -> IPv6) (socks-filter proc "\5\0\0\4\x26\x05\xbc\x80\x30\x10\x00\x60") - (ert-info ("State still waiting and response emtpy") + (ert-info ("State still waiting and response empty") (should (eq (process-get proc 'socks-state) socks-state-waiting)) (should-not (process-get proc 'socks-response))) (ert-info ("Scratch field holds partial payload of pending msg") diff --git a/test/lisp/progmodes/cperl-mode-resources/here-docs.pl b/test/lisp/progmodes/cperl-mode-resources/here-docs.pl index 8af4625fff3..bb3d4871a91 100644 --- a/test/lisp/progmodes/cperl-mode-resources/here-docs.pl +++ b/test/lisp/progmodes/cperl-mode-resources/here-docs.pl @@ -17,7 +17,7 @@ For each of the HERE documents, the following checks will done: =item * -All occurrences of the string "look-here" are fontified correcty. +All occurrences of the string "look-here" are fontified correctly. Note that we deliberately test the face, not the syntax property: Users won't care for the syntax property, but they see the face. Different implementations with different syntax properties have been diff --git a/test/lisp/textmodes/fill-tests.el b/test/lisp/textmodes/fill-tests.el index a4c7f447b59..fcc2c757091 100644 --- a/test/lisp/textmodes/fill-tests.el +++ b/test/lisp/textmodes/fill-tests.el @@ -54,7 +54,7 @@ (beg (line-beginning-position)) (end (line-end-position)) (fill-prefix (make-string (- pos beg) ?\s)) - ;; `fill-column' is too small to accomodate the current line + ;; `fill-column' is too small to accommodate the current line (fill-column (- end beg 10))) (fill-region-as-paragraph beg end nil nil pos)) (should (equal (buffer-string) string))))) @@ -69,7 +69,7 @@ (beg (line-beginning-position)) (end (line-end-position)) (fill-prefix (make-string (- pos beg) ?\s)) - ;; `fill-column' is too small to accomodate the current line + ;; `fill-column' is too small to accommodate the current line (fill-column (- end beg 10))) (fill-region-as-paragraph beg end nil nil pos)) (should (equal