From: Stefan Kangas Date: Sun, 23 Jun 2024 14:28:31 +0000 (+0200) Subject: ; Fix typos X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=711196187bf3250f427a6765f7dcdb408c2c5fcc;p=emacs.git ; Fix typos (cherry picked from commit fb11294d4156a4be45080ff286a8ee0d5a3ede9b) --- diff --git a/ChangeLog.3 b/ChangeLog.3 index 1398b9bcf53..8d227d8a47d 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -128823,7 +128823,7 @@ (setq message-send-mail-function 'message-send-mail-with-sendmail) (setq sendmail-program "msmtp") - the message seding is handled by an external program, so no Unicode + the message sending is handled by an external program, so no Unicode encoding is performed in Emacs. Thus Emacs must not assert that the Unicode encoding was performed. @@ -129602,7 +129602,7 @@ 2019-05-27 Glenn Morris - * test/lisp/autorevert-tests.el: Give on on remote hydra.nixos tests. + * test/lisp/autorevert-tests.el: Give up on remote hydra.nixos tests. (auto-revert--test-enabled-remote): Disable on hydra.nixos. @@ -135286,7 +135286,7 @@ 92ce2dd Improve documentation of window parameters 6dc42c5 Improve commentary in frame.el a8cffcf Fix typo in a doc string - 9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercas... + 9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercase... # Conflicts: # lisp/vc/vc.el @@ -223245,7 +223245,7 @@ Make ‘delete-trailing-whitespace’ delete spaces after form feed * lisp/simple.el (delete-trailing-whitespace): Treat form fead as - a non-whitespace character (regradless of whether it’s character syntax + a non-whitespace character (regardless of whether it’s character syntax is whitespace) and delete any whitespace following it instead of leaving lines with form feeds completely unchanged. I.e. a line like "\f " will now became "\f". diff --git a/ChangeLog.4 b/ChangeLog.4 index fa55bc0fe55..da5833e634d 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -1,3 +1,483 @@ +2024-06-22 Stefan Kangas + + * Version 29.4 released. + +2024-06-22 Stefan Kangas + + Bump Emacs version to 29.4 + +2024-06-22 Stefan Kangas + + Update files for Emacs 29.4 + + * ChangeLog.4: + * etc/AUTHORS: Update for Emacs 29.4. + +2024-06-22 Stefan Kangas + + * admin/authors.el: Update for Emacs 29.4 + +2024-06-22 Stefan Kangas + + * etc/NEWS: Update for Emacs 29.4 + +2024-06-22 Ihor Radchenko + + org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code + + * lisp/org/ol.el (org-link-expand-abbrev): Refuse expanding %(...) + link abbrevs that specify unsafe function. Instead, display a + warning, and do not expand the abbrev. Clear all the text properties + from the returned link, to avoid any potential vulnerabilities caused + by properties that may contain arbitrary Elisp. + +2024-06-21 Michael Albinus + + Update Tramp version (don't merge to master) + + * lisp/net/trampver.el (customize-package-emacs-version-alist): + Adapt Tramp version integrated in Emacs 29.4. + +2024-06-20 Stefan Kangas + + * admin/emacs-shell-lib: Backport to Bash 4.4 or older. + +2024-06-18 Michael Albinus + + Fix bug#49289 also for other auth-source backends + + * lisp/auth-source.el (auth-info-password): Revert commit 59261e6f4fe. + (auth-source-secrets-create, auth-source-plstore-create): + Search also for :user. (Bug#49289) + +2024-06-12 Michael Albinus + + Fix auth-info-password + + * lisp/auth-source.el (auth-info-password): :secret can be a + cascaded function. + +2024-06-01 Yuan Fu + + Fix treesit-parse-string crash (bug#71012) + + Parsing a large file with treesit-parse-string and then printing the + returned node crashes Emacs, because with-temp-buffer kills the temp + buffer when treesit-parse-string returns, and print.c tries to access + the node's position in the killed buffer. + + * lisp/treesit.el (treesit-parse-string): Don't use with-temp-buffer. + +2024-06-01 Yuan Fu + + Check for buffer liveness when accessing tree-sitter node (bug#71012) + + * src/treesit.h (treesit_node_buffer_live_p): Declare function. + * src/print.c (print_vectorlike): Print node without position if + buffer is killed. + * src/treesit.c (treesit_node_buffer_live_p): New function. + (treesit_check_node): Add buffer liveness check. + (syms_of_treesit): New error treesit-node-buffer-killed. + +2024-05-28 Eli Zaretskii + + Improve documentation of case-conversion commands + + * doc/emacs/text.texi (Case): Include the commands with negative + arguments. (Bug#71220) + +2024-05-25 Eli Zaretskii + + Avoid assertion violations in displaying under 'outline-minor-mode' + + * src/xdisp.c (init_from_display_pos): Initialize BYTEPOS + correctly, since 'init_iterator' no longer computes it from + CHARPOS as needed. This fixes a change made on Mar 13, 2013. + (Bug#71194) + +2024-05-25 Eli Zaretskii + + Improve documentation of 'no-special-glyphs' frame parameter + + * doc/lispref/frames.texi (Layout Parameters): Document + limitations of support for 'no-special-glyphs' frame parameter. + (Bug#71163) + * doc/lispref/display.texi (Truncation): Update for when + 'fringe-mode' is off. + +2024-05-24 kobarity + + Fix Python font lock of chained assignment statement + + * lisp/progmodes/python.el + (python-font-lock-keywords-maximum-decoration): Allow chaining + of single assignment statements. + * test/lisp/progmodes/python-tests.el + (python-font-lock-assignment-statement-20): New test. + (Bug#71093) + +2024-05-24 Brad Knotwell (tiny change) + + Fix example in Calc manual + + * doc/misc/calc.texi (Defining Simple Commands): Fix typo in + command names. (Bug#71166) + +2024-05-22 Eli Zaretskii + + Avoid crashes on MS-Windows due to invalid UNC file names + + * src/w32.c (parse_root): Avoid crashes due to invalid (too short) + UNC names, such as "\\". (Bug#70914) + + * test/src/fileio-tests.el (fileio-tests-invalid-UNC): New test. + +2024-05-18 Eli Zaretskii + + Document :box attribute caveats when used on display strings + + * doc/lispref/display.texi (Replacing Specs, Face Attributes): + Mention special considerations when a display string has a + ':box' face attribute identical to the surrounding buffer text. + Suggested by JD Smith . (Bug#70637) + +2024-05-18 Eli Zaretskii + + Improve documentation of 'movemail' + + * doc/emacs/rmail.texi (Movemail): Fix the name of the Mailutils + manual in the printed version. Add index entries. Move the + description of remote mailboxes to... + (Remote Mailboxes): ...here, to avoid duplication. + +2024-05-18 Jakub Ječmínek + + Replace incorrect link in Rmail chapter of Emacs manual + + * doc/emacs/rmail.texi (Movemail): Fix cross-reference to a node + in the Mailutils manual. (Bug#71018) + +2024-05-08 Eli Zaretskii + + Avoid errors in 'image-dired-tag-thumbnail' + + * lisp/image/image-dired.el (image-dired-tag-thumbnail) + (image-dired-tag-thumbnail-remove): Move here from + image-dired-tags.el. (Bug#70821) + +2024-04-27 Eli Zaretskii + + Fix last change + + * test/lisp/progmodes/csharp-mode-tests.el + (csharp-ts-mode-test-indentation): If need to skip the tree-sitter + test, do so silently. (Bug#70345) + +2024-04-27 Brad Howes (tiny change) + + Fix a typo in Introduction to Emacs Lisp (bug#70571). + +2024-04-25 Eli Zaretskii + + Fix last change + + * test/lisp/progmodes/csharp-mode-tests.el + (csharp-ts-mode-test-indentation): Move the test to here. + * test/lisp/progmodes/csharp-ts-mode-tests.el: Remove file. + * test/lisp/progmodes/csharp-ts-mode-resources/indent.erts: Move + to test/lisp/progmodes/csharp-mode-resources/indent-ts.erts. + +2024-04-25 Jacob Leeming (tiny change) + + Fix indentation of if/else in 'csharp-ts-mode' (bug#70345) + + * lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules): + Fix indentation rules for 'if' and 'else'. + + * test/lisp/progmodes/csharp-ts-mode-tests.el: + * test/lisp/progmodes/csharp-ts-mode-resources/indent.erts: New + test files. + +2024-04-23 Ulrich Müller + + * build-aux/make-info-dir: Avoid bashism (bug#70484). + +2024-04-23 Eli Zaretskii + + Improve documentation of selection and navigation in *xref* buffers + + * doc/emacs/maintaining.texi (Looking Up Identifiers): More + detailed description of 'xref-auto-jump-to-first-definition'. + Improve indexing. Describe the use of 'next-error' and + 'previous-error' in conjunction with the *xref* buffer. + (Identifier Search): More detailed description of + 'xref-auto-jump-to-first-xref'. Describe the use of 'next-error' + and 'previous-error'. + +2024-04-22 Stephen Berman + + Fix Widget manual typos, markup and omissions (bug#70502) + + * doc/misc/widget.texi (Widgets and the Buffer): Correct typos and + texinfo markup, add equivalent key bindings and make minor changes + in wording. + (Customization): Correct names of two faces and add documentation + of remaining widget faces. + +2024-04-22 Prateek Sharma + + Fix python-ts-mode built-in functions and attributes (bug#70478) + + * lisp/progmodes/python.el (python--treesit-settings): Change the + treesitter query to fetch the correct type of node for built-in + functions and attributes and highlight them with corresponding + font-lock face. + +2024-04-21 Eli Zaretskii + + Fix markup and indexing in the Calendar chapter of user manual + + * doc/emacs/calendar.texi (Calendar Unit Motion) + (Scroll Calendar, Writing Calendar Files, Holidays) + (Sunrise/Sunset, Lunar Phases, Calendar Systems) + (To Other Calendar, Displaying the Diary, Date Formats) + (Adding to Diary, Special Diary Entries): Fix markup, style, and + indexing. + +2024-04-21 Gautier Ponsinet + + Fix the user manual for `calendar-time-zone-style' + + * doc/emacs/calendar.texi (Sunrise/Sunset): Refer to the + variable `calendar-time-zone-style' explicitly. (Bug#70498) + +2024-04-21 Eli Zaretskii + + Avoid assertion violations in 'push_prefix_prop' + + * src/xdisp.c (push_prefix_prop): Set the + 'string_from_prefix_prop_p' flag for any valid value of the + 'line-prefix' or 'wrap-prefix' property/variable. (Bug#70495) + +2024-04-20 Basil L. Contovounesios + + Remove ert-equal-including-properties from manual + + * doc/misc/ert.texi (Useful Techniques): Mention only + equal-including-properties in place of the now obsolete + ert-equal-including-properties. + +2024-04-14 Eli Zaretskii + + * lisp/dnd.el (dnd-handle-movement): Avoid errors (bug#70311). + +2024-04-13 Stefan Kangas + + * doc/misc/calc.texi: Improve indexing. + +2024-04-11 Eli Zaretskii + + Fix display of vscrolled windows + + * src/xdisp.c (redisplay_window): Fix condition for resetting the + window's vscroll. (Bug#70038) + +2024-04-10 Peter Oliver + + * doc/emacs/misc.texi (emacsclient Options): Suggest forwarding sockets. + + (Bug#66667) + +2024-04-10 Yuan Fu + + Update go-ts-mode to support latest tree-sitter-go grammar + + tree-sitter-go changed method_spec to method_elem in + https://github.com/tree-sitter/tree-sitter-go/commit/b82ab803d887002a0af11f6ce63d72884580bf33 + + * lisp/progmodes/go-ts-mode.el: + (go-ts-mode--method-elem-supported-p): New function. + (go-ts-mode--font-lock-settings): Conditionally use method_elem or + method_spec in the query. + +2024-04-09 Yuan Fu + + Fix c++-ts-mode defun navigation (bug#65885) + + * lisp/progmodes/c-ts-mode.el (c-ts-base-mode): Add BOL and EOL marker + in the regexp. + +2024-03-31 Michael Albinus + + Adapt Tramp version (don't merge) + + * doc/misc/trampver.texi: + * lisp/net/trampver.el: Change version to "2.6.3". + (customize-package-emacs-version-alist): + Adapt Tramp version integrated in Emacs 29.3. + +2024-03-31 Xuan Wang (tiny change) + + Fix warning-suppress for list type "warning type" + + Per the documentation of 'warning-suppress-types' and the + implementation of 'warning-suppress-p', a warning type can + be either a symbol or a list of symbols. The previous + implementation could generate wrong 'warning-suppress-types': + + old behavior: + type warning-suppress-types + pkg -> '((pkg)) Correct + (pkg subtype) -> '(((pkg subtype))) Incorrect + + Now we check whether type is a cons cell first. (Should not + use listp here, as listp returns t for nil.) + + new behavior: + type warning-suppress-types + pkg -> '((pkg)) Correct + (pkg subtype) -> '((pkg subtype)) Correct + + * lisp/emacs-lisp/warnings.el (warnings-suppress): Fix saving + warning types in 'warning-suppress-types'. (Bug#70063) + +2024-03-31 Theodor Thornhill + + Make object init more robust (bug#69571) + + * lisp/progmodes/csharp-mode.el (csharp-guess-basic-syntax): Make the + regex same as before, but conditionally check other heuristics rather + than crazy regex shenanigans. + +2024-03-30 Eli Zaretskii + + Avoid errors in Info-search-case-sensitively in DIR buffers + + * lisp/info.el (Info-search): Don't run the "try other subfiles" + code if there are no subfiles. This happens, for example, in DIR + files. (Bug#70058) + +2024-03-28 Theodor Thornhill + + Add test for previous change (bug#70023) + + * test/lisp/progmodes/typescript-ts-mode-resources/indent.erts: Add + test. + +2024-03-28 Noah Peart + + Add typescript-ts-mode indentation for interface bodies (bug#70023) + + * lisp/progmodes/typescript-ts-mode.el + (typescript-ts-mode--indent-rules): Add indentation rule for + interface bodies. + +2024-03-26 Andrea Corallo + + * Don't install unnecessary trampolines (bug#69573) (don't merge) + + * lisp/emacs-lisp/comp.el (comp-subr-trampoline-install): + Check that subr-name actually matches the target subr. + +2024-03-25 Eli Zaretskii + + Improve documentation of in user manual + + * doc/emacs/basic.texi (Erasing): Document that deletes + entire grapheme clusters. + +2024-03-25 Eli Zaretskii + + Fix documentation of 'other-window-for-scrolling' + + * src/window.c (Fother_window_for_scrolling): More accurate + documentation of how "the other" window is looked for. Suggested + by Karthik Chikmagalur . + +2024-03-24 Eli Zaretskii + + Bump Emacs version to 29.3.50 + + * README: + * configure.ac: + * nt/README.W32: + * msdos/sed2v2.inp: + * etc/NEWS: Bump Emacs version to 29.3.50. + +2024-03-24 Eli Zaretskii + + Update files for Emacs 29.3 + + * ChangeLog.4: + * etc/AUTHORS: + * etc/HISTORY: Update for Emacs 29.3. + +2024-03-24 Eli Zaretskii + + * lisp/ldefs-boot.el: Regenerate. + +2024-03-24 Eli Zaretskii + + Bump Emacs version to 29.3 + + * README: + * configure.ac: + * nt/README.W32: + * msdos/sed2v2.inp: Bump Emacs version to 29.3. + +2024-03-24 Ihor Radchenko + + org--confirm-resource-safe: Fix prompt when prompting in non-file Org buffers + + * lisp/org/org.el (org--confirm-resource-safe): When called from + non-file buffer, do not put stray "f" in the prompt. + +2024-03-24 Ihor Radchenko + + org-file-contents: Consider all remote files unsafe + + * lisp/org/org.el (org-file-contents): When loading files, consider all + remote files (like TRAMP-fetched files) unsafe, in addition to URLs. + +2024-03-24 Ihor Radchenko + + org-latex-preview: Add protection when `untrusted-content' is non-nil + + * lisp/org/org.el (org--latex-preview-when-risky): New variable + controlling how to handle LaTeX previews in Org files from untrusted + origin. + (org-latex-preview): Consult `org--latex-preview-when-risky' before + generating previews. + + This patch adds a layer of protection when LaTeX preview is requested + for an email attachment, where `untrusted-content' is set to non-nil. + +2024-03-24 Ihor Radchenko + + * lisp/gnus/mm-view.el (mm-display-inline-fontify): Mark contents untrusted. + +2024-03-24 Ihor Radchenko + + * lisp/files.el (untrusted-content): New variable. + + The new variable is to be used when buffer contents comes from untrusted + source. + +2024-03-24 Ihor Radchenko + + org-macro--set-templates: Prevent code evaluation + + * lisp/org/org-macro.el (org-macro--set-templates): Get rid of any + risk to evaluate code when `org-macro--set-templates' is called as a + part of major mode initialization. This way, no code evaluation is + ever triggered when user merely opens the file or when + `mm-display-org-inline' invokes Org major mode to fontify mime part + preview in email messages. + +2024-03-24 Eli Zaretskii + + * admin/authors.el (authors-aliases): Add ignored authors. + 2024-03-24 Ihor Radchenko org--confirm-resource-safe: Fix prompt when prompting in non-file Org buffers diff --git a/ChangeLog.android b/ChangeLog.android index e86ef7a2a77..1acf157dfbf 100644 --- a/ChangeLog.android +++ b/ChangeLog.android @@ -5406,7 +5406,7 @@ (syms_of_androidselect): Define it. * src/emacs.c (load_pdump): Eschew excessively elaborate dump file - location code on on Android. + location code on Android. * src/pdumper.c (Fdump_emacs_portable): Allow dumping while interactive on Android. diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude index f01302b7931..733e548a598 100644 --- a/admin/codespell/codespell.exclude +++ b/admin/codespell/codespell.exclude @@ -87,7 +87,7 @@ be shown. On positions 3,4, and 7, the @samp{alog} function will be As is my wont, I started hacking on it almost immediately. I first The latter criterion is the "je ne sais quoi" of the artistic aspect of order but are now listed consecutively en bloc. - "mot de passe" "Mot de passe") + "mot de passe" "Mot de passe") Reported by Mor Zahavi . (Bug#51271) * etc/refcards/fr-refcard.tex (section{Formater}): Remove mention Reported by Ture Pålsson. diff --git a/admin/codespell/codespell.ignore b/admin/codespell/codespell.ignore index 02bd6d05838..ebb85e510bb 100644 --- a/admin/codespell/codespell.ignore +++ b/admin/codespell/codespell.ignore @@ -32,6 +32,7 @@ msdos ot parm parms +proced reenable reenabled requestor diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1 index ee8f418414c..e2d4c019b4a 100644 --- a/doc/lispref/ChangeLog.1 +++ b/doc/lispref/ChangeLog.1 @@ -4890,7 +4890,7 @@ 2011-05-10 Jim Meyering - * minibuf.texi: Fix typo "in in -> in". + * minibuf.texi: Fix typo. 2011-05-06 Paul Eggert diff --git a/doc/lispref/peg.texi b/doc/lispref/peg.texi index e496e1cf817..01666456c9c 100644 --- a/doc/lispref/peg.texi +++ b/doc/lispref/peg.texi @@ -29,7 +29,7 @@ current buffer, using a given set of rules. @cindex root, of parsing expression grammar @cindex entry-point, of parsing expression grammar Each rule in a @acronym{PEG} is referred to as a @dfn{parsing -expression} (@acronym{PEX}), and can be specified a a literal string, a +expression} (@acronym{PEX}), and can be specified a literal string, a regexp-like character range or set, a peg-specific construct resembling an Emacs Lisp function call, a reference to another rule, or a combination of any of these. A grammar is expressed as a tree of rules diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 7f299180fc6..156b4297501 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -5128,7 +5128,7 @@ started on line 2. Lines 4 and 5 get the syntaxes though part of a function. Note that the @code{requires} on Line 3 begins a @dfn{requires -expression}, not a a requires clause, hence its components are not +expression}, not a requires clause, hence its components are not assigned @code{constraint-cont}. See @url{https://en.cppreference.com/w/cpp/language/requires}. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 4fcdcf9babe..745959f9c09 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -20409,7 +20409,7 @@ Anyway, if you'd like to dig into it yourself, here's an example: (read-only nil) (orphan -10) (adapt t) - (files "/hom/larsi/News/gnu.SCORE") + (files "/home/larsi/News/gnu.SCORE") (exclude-files "all.SCORE") (local (gnus-newsgroup-auto-expire t) (gnus-summary-make-false-root empty)) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index edeb7d3ab6c..519d9ca2ee9 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -177,7 +177,7 @@ Previously, when exporting to Org, all the citations and =print_bibliography= keywords, were transformed according to the chosen citation processor. -This is no loner the case. All the citation-related markup is now +This is no longer the case. All the citation-related markup is now exported as is. The previous behavior can be reverted by setting new custom option diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el index 7ee0c8cc71e..08bd56ede70 100644 --- a/etc/themes/leuven-theme.el +++ b/etc/themes/leuven-theme.el @@ -848,7 +848,7 @@ more..." `(org-example ((,class (:foreground "blue" :background "#EEFFEE")))) `(org-footnote ((,class (:underline t :foreground "#008ED1")))) `(org-formula ((,class (:foreground "chocolate1")))) - ;; org-habit colours are thanks to zenburn + ;; org-habit colors are thanks to zenburn `(org-habit-ready-face ((t :background "#7F9F7F"))) ; ,zenburn-green `(org-habit-alert-face ((t :background "#E0CF9F" :foreground "#3F3F3F"))) ; ,zenburn-yellow-1 fg ,zenburn-bg `(org-habit-clear-face ((t :background "#5C888B"))) ; ,zenburn-blue-3 diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index 49296aaf3a7..037bb41092b 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -570,7 +570,7 @@ 1986-01-18 Richard M. Stallman (rms@prep) - * doctor.el: Fix typo "symtoms". + * doctor.el: Fix typo for "symptoms". 1986-01-10 Richard Mlynarik (mly@prep) diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index 1504d89731d..e2657dbabd8 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -256,7 +256,7 @@ specifying a region in the current buffer, or (:file . FILENAME) to temporarily insert the contents of FILENAME. Before executing BODY, narrow the buffer to the text for COMMAND -and and set point to the beginning of the narrowed region. +and set point to the beginning of the narrowed region. The value returned is the last form in BODY." (declare (indent 1)) diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3 index 1633b8835eb..fa376f02a7e 100644 --- a/lisp/gnus/ChangeLog.3 +++ b/lisp/gnus/ChangeLog.3 @@ -5560,7 +5560,7 @@ 2011-05-10 Jim Meyering - * shr.el (shr-colorize-region): Fix typo "on on -> on". + * shr.el (shr-colorize-region): Fix typo. 2011-05-10 Julien Danjou diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el index db75f1f0ad5..8ea1ff6d1a5 100644 --- a/lisp/org/ob-core.el +++ b/lisp/org/ob-core.el @@ -2861,7 +2861,7 @@ file's directory then expand relative links. If the optional TYPE is passed as `attachment' and the path is a descendant of the DEFAULT-DIRECTORY, the generated link will be -specified as an an \"attachment:\" style link." +specified as an \"attachment:\" style link." (when (stringp result) (let* ((result-file-name (expand-file-name result)) (base-file-name (buffer-file-name (buffer-base-buffer))) diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el index 39dda4332aa..cabed6acf72 100644 --- a/lisp/org/org-indent.el +++ b/lisp/org/org-indent.el @@ -105,7 +105,7 @@ For details see the variable `org-adapt-indentation'." (defcustom org-indent-post-buffer-init-functions nil "Hook run after org-indent finishes initializing a buffer. -The function(s) in in this hook must accept a single argument representing +The function(s) in this hook must accept a single argument representing the initialized buffer." :group 'org-indent :package-version '(Org . "9.7") diff --git a/lisp/org/org.el b/lisp/org/org.el index 2be404e368e..1e6c10d8011 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -15434,7 +15434,7 @@ When SUPPRESS-TMP-DELAY is non-nil, suppress delays like (defun org-modify-ts-extra (ts-string pos nincrements increment-step) "Change the lead-time/repeat fields at POS in timestamp string TS-STRING. POS is the position in the timestamp string to be changed. -NINCREMENTS is the number of incremenets/decrements. +NINCREMENTS is the number of increments/decrements. INCREMENT-STEP is step used for a single increment when POS in on minutes. Before incrementing minutes, they are rounded to diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 06b919f26fd..233d23492b6 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1954,7 +1954,7 @@ ender." ;; The following is no longer used (2020-02-16). ;; (c-lang-defconst c-last-open-c-comment-start-on-line-re ;; "Regexp which matches the last block comment start on the -;; current ine, if any, or nil in those languages without block +;; current one, if any, or nil in those languages without block ;; comments. When a match is found, submatch 1 contains the comment ;; starter." ;; t "\\(/\\*\\)\\([^*]\\|\\*+\\([^*/]\\|$\\)\\)*$" diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 687b176009e..85fc6b930f5 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -347,7 +347,7 @@ The actually processing is done by DO-STRING and DO-REGION DEFVAR forms reset the variables to the init values." (save-excursion ;; Find the end of the defun this way to avoid having the region - ;; possibly end with a comment (it there'a a comment after the + ;; possibly end with a comment (it there's a comment after the ;; final parenthesis). (beginning-of-defun) (forward-sexp) diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 1f7d6f5b3ee..bede26b7da5 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -717,7 +717,7 @@ characters of the current line." (c-ts-common-comment-2nd-line-matcher c-ts-common-comment-2nd-line-anchor 1))) - "Tree-sitter indentation rules for for `phpdoc'.") + "Tree-sitter indentation rules for `phpdoc'.") ;;; Font-lock @@ -1561,7 +1561,7 @@ The optional TYPE can be the symbol \"port\", \"hostname\", \"document-root\" or (defun run-php (&optional cmd config) "Run an PHP interpreter as a inferior process. -Arguments CMD an CONFIG, default to `php-ts-mode-php-executable' +Arguments CMD and CONFIG, default to `php-ts-mode-php-executable' and `php-ts-mode-php-config' respectively, control which PHP interpreter is run. Prompt for CMD if `php-ts-mode-php-executable' is nil. Optional CONFIG, if supplied, is the php.ini file to use." diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 5c744374128..f126df8955a 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -1418,7 +1418,7 @@ Leave point at the beginning of the tag." (with-syntax-table sgml-tag-syntax-table (let ((pos (point))) (condition-case nil - ;; FIXME: This does not correctly skip over PI an CDATA tags. + ;; FIXME: This does not correctly skip over PI and CDATA tags. (sgml-forward-sexp 1) (scan-error ;; This < seems to be just a spurious one, let's ignore it. diff --git a/lisp/which-key.el b/lisp/which-key.el index e9567d262c6..ee7a1cea333 100644 --- a/lisp/which-key.el +++ b/lisp/which-key.el @@ -1052,7 +1052,7 @@ replacement. In the second case, the second string is used to provide a longer name for the keys under a prefix. -MORE allows you to specifcy additional KEY REPLACEMENT pairs. All +MORE allows you to specify additional KEY REPLACEMENT pairs. All replacements are added to `which-key-replacement-alist'." ;; TODO: Make interactive (while key-sequence @@ -1923,7 +1923,7 @@ Requires `which-key-compute-remaps' to be non-nil." PREFIX limits bindings to those starting with this key sequence. START is a list of existing bindings to add to. If ALL is non-nil, recursively retrieve all bindings below PREFIX. If -EVIL is non-nil, extract active evil bidings." +EVIL is non-nil, extract active evil bindings." (let ((bindings start) (ignore '(self-insert-command ignore ignore-event company-ignore)) (evil-map diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index 7792bd88c01..798e87dd572 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 @@ -5956,7 +5956,7 @@ Assume C89 or later for math functions (Bug#12381). This simplifies the code, and makes it a bit smaller and faster, and (most important) makes it easier to clean up signal handling - since we can stop worring about floating-point exceptions in + since we can stop worrying about floating-point exceptions in library code. That was a problem before C89, but the problem went away many years ago on all practical Emacs targets. * data.c, image.c, lread.c, print.c: diff --git a/src/w32image.c b/src/w32image.c index e71471f4a7c..359a4fa3a72 100644 --- a/src/w32image.c +++ b/src/w32image.c @@ -605,7 +605,7 @@ get_encoder_clsid (const char *type, CLSID *clsid) DEFUN ("w32image-create-thumbnail", Fw32image_create_thumbnail, Sw32image_create_thumbnail, 5, 5, 0, - doc: /* Create a HEIGHT by WIDTH thumnail file THUMB-FILE for image INPUT-FILE. + doc: /* Create a HEIGHT by WIDTH thumbnail file THUMB-FILE for image INPUT-FILE. TYPE is the image type to use for the thumbnail file, a string. It is usually identical to the file-name extension of THUMB-FILE, but without the leading period, and both "jpeg" and "jpg" can be used for JPEG. diff --git a/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl b/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl index 8d2f6397e9d..4c59ad6249a 100644 --- a/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl +++ b/test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl @@ -8,7 +8,7 @@ print $string_with_strange_delimiters; $printed = 1; # With cperl-extra-delimiters-mode=on the previous lines are a label -# and a a print statement. This line here is a comment. Without +# and a print statement. This line here is a comment. Without # cperl-extra-delimiters-mode, all this is part of the variable # declaration. diff --git a/test/lisp/ses-tests.el b/test/lisp/ses-tests.el index a916aed9eb3..3ca1297f5ec 100644 --- a/test/lisp/ses-tests.el +++ b/test/lisp/ses-tests.el @@ -201,7 +201,7 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to (ert-deftest ses-jump-B2-lowcase () - "Test jumping to cell B2 by use of lowcase cell name string" + "Test jumping to cell B2 by use of lowercase cell name string" (let ((ses-initial-size '(3 . 3)) ses-after-entry-functions) (with-temp-buffer @@ -211,7 +211,7 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to (should (eq (ses--cell-at-pos (point)) 'B2))))) (ert-deftest ses-jump-B2-lowcase-keys () - "Test jumping to cell B2 by use of lowcase cell name string with simulating keys" + "Test jumping to cell B2 by use of lowercase cell name string with simulating keys" (let ((ses-initial-size '(3 . 3)) ses-after-entry-functions) (with-temp-buffer