From 9743fc8d134f3934e0f7aaa5c2608dbcecb07ff6 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 23 Jan 2025 03:13:01 +0100 Subject: [PATCH] ; Fix typos (cherry picked from commit cda78edc7d9194181bcda1790f29cb7cf3ceb0b9) --- ChangeLog.3 | 8 ++++---- admin/codespell/codespell.exclude | 19 +++++++++++++------ admin/nt/dist-build/build-dep-zips.py | 8 ++++---- admin/nt/dist-build/emacs.nsi | 6 +++--- doc/lispref/frames.texi | 2 +- doc/lispref/internals.texi | 2 +- etc/PROBLEMS | 4 ++-- etc/future-bug | 2 +- lisp/calendar/calendar.el | 2 +- lisp/progmodes/meta-mode.el | 2 +- lisp/type-break.el | 4 ++-- nextstep/README | 12 ++++++------ src/ChangeLog.3 | 2 +- src/keyboard.c | 2 +- 14 files changed, 41 insertions(+), 34 deletions(-) diff --git a/ChangeLog.3 b/ChangeLog.3 index 41bbdbbdc9a..0a744120218 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -47356,7 +47356,7 @@ possible bug. * lisp/progmodes/flymake.el (flymake--mode-line-counter): Must - explicily create a new string unpropertized string + explicitly create a new string unpropertized string 2020-12-31 João Távora @@ -160588,7 +160588,7 @@ to be replaced with an appropriate character reference. Make ‘sgml-quote’ do that. - While at it, fix entiteis not being unquoted if they lack closing + While at it, fix entities not being unquoted if they lack closing semicolon (e.g. ‘&’) occurring at the very end of a region. Even though unlikely, make ‘sgml-quote’ handle this scenario. @@ -186568,7 +186568,7 @@ Delete a Flymake obsolete alias that can't possibly work The function `flymake-ler-make-ler' can't possibly work as an backward - compatible interface to existing extensinos (even purely hypothetical + compatible interface to existing extensions (even purely hypothetical ones, since none are known). This is because every diagnostic considered by Flymake has to passed to a report-fn function. @@ -223233,7 +223233,7 @@ called any longer. Furthermore, when newline has whitespace syntax, ‘\s-$’ regular - expression ends up matching empty lins since ‘\s-’ matches newline + expression ends up matching empty lines since ‘\s-’ matches newline characetr of proceeding line. This leads to needless loop iterations. Since previous change to ‘delete-trailing-whitespace’ already introduced diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude index f11918f53f3..ac702b3c1ea 100644 --- a/admin/codespell/codespell.exclude +++ b/admin/codespell/codespell.exclude @@ -1743,9 +1743,16 @@ Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph 2a85d81c47 Add support for gathering statistics on use-package declar... (let* ((nam (buffer-substring (match-beginning 2) (match-end 2))) (setq nmlst (cons nam nmlst) - (df '((defualt :foreground "cyan")))) -All the characters whose Unicode general-category is Nd now have the -;;; Each character whose Unicode general-category is Nd gets the digit - (skipp (or (erc--memq-msg-prop 'erc--skip 'stamp) - (when (and fullp culled (not skipp) (< 1 beg 3 end)) - ((not skipp)) + (elisp--safe-macroexpand-all): Make the warning more discrete. +|PACK|UNPK|INDX|BLD |LEN |... | +@key{INDX} removes an integer @var{n}, then builds a vector of +integers from 1 to @var{n}. @kbd{INV INDX} takes three numbers +(sref STRING INDX) returns the character in STRING at INDEX. INDEX +;; |PACK|UNPK|INDX|BLD |LEN |... | + ( "INDX" (progn calc-num-prefix calc-index) "\C-u\excalc-index\r" ) + (calc-enter-result 3 "indx" (cons 'calcFunc-index (calc-top-list-n 3))) + (calc-enter-result 0 "indx" (list 'calcFunc-index + (elisp--safe-macroexpand-all): Make the warning more discreet. + dee6b36286 If use-package-verbose is t, show loading times when :afte... + 267fc6d00c4 ruby-smie-rules: Fix misindentation of a method call afte... + b0181dafb9e Improve documentation of 'enable-local-variables' in Emac... diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py index 567e8eb2133..af3036eb8e6 100755 --- a/admin/nt/dist-build/build-dep-zips.py +++ b/admin/nt/dist-build/build-dep-zips.py @@ -30,7 +30,7 @@ EMACS_MAJOR_VERSION= os.getenv('EMACS_MAJOR_VERSION') or "30" # Base URI for the package sources mapped in PKG_REQ SRC_REPO="https://repo.msys2.org/mingw/sources" -# Map items in `dynamic-library-alist' to source pakages +# Map items in `dynamic-library-alist' to source packages PKG_REQ='''mingw-w64-x86_64-giflib mingw-w64-x86_64-gnutls mingw-w64-x86_64-harfbuzz @@ -47,7 +47,7 @@ mingw-w64-x86_64-xpm-nox mingw-w64-x86_64-tree-sitter mingw-w64-x86_64-sqlite3'''.split() -# Emacs style path to dependancy DLLs on build system +# Emacs style path to dependency DLLs on build system DLL_SRC="c:/msys64/mingw64/bin" # libraries we never include @@ -110,7 +110,7 @@ def gather_deps(): print("Deps updated in", os.getcwd(), "as", zipfile) os.chdir("../") -# Return dependancies listed in Emacs +# Return dependencies listed in Emacs def init_deps(): return '''libXpm-nox4.dll libpng16-16.dll @@ -382,7 +382,7 @@ parser.add_argument("-d", help="dry run", parser.add_argument("-l", help="list dependencies", action="store_true") -parser.add_argument("-e", help="extract direct dependancies", +parser.add_argument("-e", help="extract direct dependencies", action="store_true") args = parser.parse_args() diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi index b8226d69423..4a5de4f85f9 100644 --- a/admin/nt/dist-build/emacs.nsi +++ b/admin/nt/dist-build/emacs.nsi @@ -92,7 +92,7 @@ Section "Uninstall" # remove All Users shortcuts only # SetShellVarContext all - # retreive/recalculate uninstaller location + # retrieve/recalculate uninstaller location StrCpy $UninstallerPath "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" # remove registry key @@ -101,7 +101,7 @@ Section "Uninstall" # delete uninstaller Delete "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" - # retreive/reclculate startmenu shortcuts location + # retrieve/recalculate startmenu shortcuts location !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder StrCpy $StartMenuFolder "$SMPROGRAMS\$StartMenuFolder" @@ -120,7 +120,7 @@ Section "Uninstall" # we're basically using GOTO, above, so we should get here.. startMenuDeleteLoopDone: - # next we remove stuff from program-files/instalation path + # next we remove stuff from program-files/installation path # start with recursive delete of the Emacs we installed RMDir /r "$INSTDIR\emacs-${VERSION_BRANCH}" diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 7470716a587..c71b977550e 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -4759,7 +4759,7 @@ and secondary selections by saving the value supplied into a variable subsequent calls to @code{gui-get-selection} return. From the clipboard, @code{gui-get-selection} is capable of returning -UTF-8 string data of the type @code{STRING}, the @code{TAREGTS} data +UTF-8 string data of the type @code{STRING}, the @code{TARGETS} data type, or image and application data of any MIME type. @code{gui-set-selection} sets only string data, much as under MS-Windows, although this data is not affected by the value of diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index d2bb76f1705..652439f12d8 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -2745,7 +2745,7 @@ The window-relative vertical position of the line containing @item window_end_valid This field is set to a non-zero value if @code{window_end_pos} and @code{window_end_vpos} are truly valid. This is zero if nontrivial -redisplay is pre-empted, since in that case the display that +redisplay is preempted, since in that case the display that @code{window_end_pos} was computed for did not get onto the screen. @item cursor diff --git a/etc/PROBLEMS b/etc/PROBLEMS index e0aa05f3826..4496b9c7968 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1600,7 +1600,7 @@ https://lists.gnu.org/r/emacs-devel/2016-07/msg00154.html. *** In Emacs built with GTK+ toolkit, menu-bar background becomes transparent. -This happens when 'alpha-background' is less than 100. This is due a +This happens when 'alpha-background' is less than 100. This is due to a GTK limitation, for which no workaround is currently known, unfortunately. @@ -1622,7 +1622,7 @@ after switching back from another virtual desktop. Setting the variable *** Gnome desktop does not respect frame size specified in .Xresources -This has been obeserved when running a GTK+ build of Emacs 29 from the +This has been observed when running a GTK+ build of Emacs 29 from the launch pad on Ubuntu 24.04 with mutter as window manager. The problem can be resolved by running Emacs from the command line instead. diff --git a/etc/future-bug b/etc/future-bug index c18dd995d66..a9c871d6cee 100644 --- a/etc/future-bug +++ b/etc/future-bug @@ -30,7 +30,7 @@ comments when you write it (sometime in 2198 as I recall). P.S. You'll be pleased to know that since (time-forward N) still works - for N >= 0, we've used it to pre-emptively update configure.ac. + for N >= 0, we've used it to preemptively update configure.ac. Emacs now configures and builds on every platform that will ever be made. It wasn't easy, but at least that's one problem out of the way for good. If you'd like the patch, just ask. diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 3abec0009d9..c519644ae58 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -102,7 +102,7 @@ ;; the absolute format (see e.g. `calendar-iso-from-absolute' in ;; cal-iso.el). This representation is also useful for certain ;; calculations; e.g. `calendar-day-of-week' is simply the absolute -;; represention modulo 7, because December 31, 1BC is a Sunday. +;; representation modulo 7, because December 31, 1BC is a Sunday. ;; A note on free variables: diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index e67245b0839..4fcfede3b00 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -198,7 +198,7 @@ ;; ;; The expected syntax of an item is either "word" or "symbol", ;; possibly ending with optional whitespace. Everything following - ;; the item (but belonging to it) is expected to by skipable by + ;; the item (but belonging to it) is expected to by skippable by ;; `forward-sexp'. The list of items is expected to be separated ;; by commas and terminated by semicolons or equals signs. ;; diff --git a/lisp/type-break.el b/lisp/type-break.el index b36860e48ef..551af70a484 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -116,8 +116,8 @@ then there is no minimum threshold; as soon as the scheduled time has elapsed, the user will always be queried. The second number is the maximum number of keystrokes that can be entered -before a typing break is requested immediately, pre-empting the originally -scheduled break. If this second value is nil, then no pre-emptive breaks +before a typing break is requested immediately, preempting the originally +scheduled break. If this second value is nil, then no preemptive breaks will occur; only scheduled ones will. Keys with bucky bits (shift, control, meta, etc) are counted as only one diff --git a/nextstep/README b/nextstep/README index 487ea52ead4..853d6bcda35 100644 --- a/nextstep/README +++ b/nextstep/README @@ -14,7 +14,7 @@ OpenStep and then Rhapsody, which became Mac OS X. In 2004 it was adapted to GNUstep, a free OpenStep implementation, and in 2008 it was merged to the GNU Emacs trunk and released with Emacs 23. Around the same time a separate Mac-only port using the Carbon APIs and -descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed. (It +descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed. (It remains available externally under the name "mac".) @@ -48,12 +48,12 @@ Classes are declared like the following: GUIDELINES -* Adhere the to the FSF philosophy that a feature in GNU software - should not only be available on non-free systems. +* Adhere to the FSF philosophy that a feature in GNU software should not + only be available on non-free systems. * People with varying Cocoa and Objective-C skills will read and modify the NS code over a long period of time. Keep the code simple - and avoid language constructs that makes the code hard to maintain. + and avoid language constructs that make the code hard to maintain. * Don't use macros and types intended for the XCode Interface Builder, like 'IBAction'. @@ -81,7 +81,7 @@ GNUstep. Even though they are less frequently used, this is important for a number of reasons: * It supports the GNUstep project and provides an Emacs with the same - look-and-feel as the rest of the system. + look and feel as the rest of the system. * This allows other Emacs developers to test their changes on the NS interface without having access to a macOS machine. @@ -93,7 +93,7 @@ for a number of reasons: SEE ALSO -The src/ns... files contains the C and Objective-C parts. +The src/ns... files contain the C and Objective-C parts. The lisp/term/ns-win.el file contains the lisp part of the NS interface. diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 3cb0d1ac453..5162519148d 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -15583,7 +15583,7 @@ 1989-04-29 Joe Arceneaux (jla@apple-gunkies.ai.mit.edu) - * xterm.c (x_term_init): Don't set visible bell, as it pre-empts + * xterm.c (x_term_init): Don't set visible bell, as it preempts .emacs control. 1989-04-26 Richard Stallman (rms@sugar-bombs.ai.mit.edu) diff --git a/src/keyboard.c b/src/keyboard.c index 723c51b3ce5..d3516984691 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2675,7 +2675,7 @@ read_char (int commandflag, Lisp_Object map, /* Normal case: no input arrived during redisplay. */ break; - /* Input arrived and pre-empted redisplay. + /* Input arrived and preempted redisplay. Process any events which are not user-visible. */ swallow_events (false); /* If that cleared input_pending, try again to redisplay. */ -- 2.39.5