diff options
| author | Stefan Kangas | 2024-06-23 16:28:31 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2024-06-23 16:40:06 +0200 |
| commit | fb11294d4156a4be45080ff286a8ee0d5a3ede9b (patch) | |
| tree | 5c30d9724edcb7ba3a58d92b4b2618943fa1b3e2 | |
| parent | d9bd1718f9a3561f7aa233f105f78aaa7f8dc93a (diff) | |
| download | emacs-fb11294d4156a4be45080ff286a8ee0d5a3ede9b.tar.gz emacs-fb11294d4156a4be45080ff286a8ee0d5a3ede9b.zip | |
; Fix typos
| -rw-r--r-- | ChangeLog.3 | 8 | ||||
| -rw-r--r-- | ChangeLog.4 | 2 | ||||
| -rw-r--r-- | ChangeLog.android | 2 | ||||
| -rw-r--r-- | admin/codespell/codespell.exclude | 2 | ||||
| -rw-r--r-- | admin/codespell/codespell.ignore | 1 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | doc/lispref/peg.texi | 2 | ||||
| -rw-r--r-- | doc/misc/cc-mode.texi | 2 | ||||
| -rw-r--r-- | doc/misc/gnus.texi | 2 | ||||
| -rw-r--r-- | etc/ORG-NEWS | 2 | ||||
| -rw-r--r-- | etc/themes/leuven-theme.el | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-find.el | 2 | ||||
| -rw-r--r-- | lisp/completion.el | 2 | ||||
| -rw-r--r-- | lisp/eshell/esh-util.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog.3 | 2 | ||||
| -rw-r--r-- | lisp/org/ob-core.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-indent.el | 2 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/inf-lisp.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/php-ts-mode.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 2 | ||||
| -rw-r--r-- | lisp/which-key.el | 4 | ||||
| -rw-r--r-- | src/ChangeLog.12 | 2 | ||||
| -rw-r--r-- | src/w32image.c | 2 | ||||
| -rw-r--r-- | test/lisp/progmodes/cperl-mode-resources/extra-delimiters.pl | 2 | ||||
| -rw-r--r-- | test/lisp/ses-tests.el | 4 |
28 files changed, 34 insertions, 33 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3 index 1398b9bcf53..8d227d8a47d 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 | |||
| @@ -128823,7 +128823,7 @@ | |||
| 128823 | (setq message-send-mail-function 'message-send-mail-with-sendmail) | 128823 | (setq message-send-mail-function 'message-send-mail-with-sendmail) |
| 128824 | (setq sendmail-program "msmtp") | 128824 | (setq sendmail-program "msmtp") |
| 128825 | 128825 | ||
| 128826 | the message seding is handled by an external program, so no Unicode | 128826 | the message sending is handled by an external program, so no Unicode |
| 128827 | encoding is performed in Emacs. Thus Emacs must not assert that the | 128827 | encoding is performed in Emacs. Thus Emacs must not assert that the |
| 128828 | Unicode encoding was performed. | 128828 | Unicode encoding was performed. |
| 128829 | 128829 | ||
| @@ -129602,7 +129602,7 @@ | |||
| 129602 | 129602 | ||
| 129603 | 2019-05-27 Glenn Morris <rgm@gnu.org> | 129603 | 2019-05-27 Glenn Morris <rgm@gnu.org> |
| 129604 | 129604 | ||
| 129605 | * test/lisp/autorevert-tests.el: Give on on remote hydra.nixos tests. | 129605 | * test/lisp/autorevert-tests.el: Give up on remote hydra.nixos tests. |
| 129606 | 129606 | ||
| 129607 | (auto-revert--test-enabled-remote): Disable on hydra.nixos. | 129607 | (auto-revert--test-enabled-remote): Disable on hydra.nixos. |
| 129608 | 129608 | ||
| @@ -135286,7 +135286,7 @@ | |||
| 135286 | 92ce2dd Improve documentation of window parameters | 135286 | 92ce2dd Improve documentation of window parameters |
| 135287 | 6dc42c5 Improve commentary in frame.el | 135287 | 6dc42c5 Improve commentary in frame.el |
| 135288 | a8cffcf Fix typo in a doc string | 135288 | a8cffcf Fix typo in a doc string |
| 135289 | 9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercas... | 135289 | 9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercase... |
| 135290 | 135290 | ||
| 135291 | # Conflicts: | 135291 | # Conflicts: |
| 135292 | # lisp/vc/vc.el | 135292 | # lisp/vc/vc.el |
| @@ -223245,7 +223245,7 @@ | |||
| 223245 | Make ‘delete-trailing-whitespace’ delete spaces after form feed | 223245 | Make ‘delete-trailing-whitespace’ delete spaces after form feed |
| 223246 | 223246 | ||
| 223247 | * lisp/simple.el (delete-trailing-whitespace): Treat form fead as | 223247 | * lisp/simple.el (delete-trailing-whitespace): Treat form fead as |
| 223248 | a non-whitespace character (regradless of whether it’s character syntax | 223248 | a non-whitespace character (regardless of whether it’s character syntax |
| 223249 | is whitespace) and delete any whitespace following it instead of leaving | 223249 | is whitespace) and delete any whitespace following it instead of leaving |
| 223250 | lines with form feeds completely unchanged. I.e. a line like "\f " will | 223250 | lines with form feeds completely unchanged. I.e. a line like "\f " will |
| 223251 | now became "\f". | 223251 | now became "\f". |
diff --git a/ChangeLog.4 b/ChangeLog.4 index 364fa212709..e510dec7b51 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 | |||
| @@ -309,7 +309,7 @@ | |||
| 309 | 309 | ||
| 310 | 2024-03-31 Michael Albinus <michael.albinus@gmx.de> | 310 | 2024-03-31 Michael Albinus <michael.albinus@gmx.de> |
| 311 | 311 | ||
| 312 | Adapt Tramp versio (don't merge) | 312 | Adapt Tramp version (don't merge) |
| 313 | 313 | ||
| 314 | * doc/misc/trampver.texi: | 314 | * doc/misc/trampver.texi: |
| 315 | * lisp/net/trampver.el: Change version to "2.6.3". | 315 | * lisp/net/trampver.el: Change version to "2.6.3". |
diff --git a/ChangeLog.android b/ChangeLog.android index e86ef7a2a77..1acf157dfbf 100644 --- a/ChangeLog.android +++ b/ChangeLog.android | |||
| @@ -5406,7 +5406,7 @@ | |||
| 5406 | (syms_of_androidselect): Define it. | 5406 | (syms_of_androidselect): Define it. |
| 5407 | 5407 | ||
| 5408 | * src/emacs.c (load_pdump): Eschew excessively elaborate dump file | 5408 | * src/emacs.c (load_pdump): Eschew excessively elaborate dump file |
| 5409 | location code on on Android. | 5409 | location code on Android. |
| 5410 | 5410 | ||
| 5411 | * src/pdumper.c (Fdump_emacs_portable): Allow dumping while | 5411 | * src/pdumper.c (Fdump_emacs_portable): Allow dumping while |
| 5412 | interactive on Android. | 5412 | 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 | |||
| 87 | As is my wont, I started hacking on it almost immediately. I first | 87 | As is my wont, I started hacking on it almost immediately. I first |
| 88 | The latter criterion is the "je ne sais quoi" of the artistic aspect of | 88 | The latter criterion is the "je ne sais quoi" of the artistic aspect of |
| 89 | order but are now listed consecutively en bloc. | 89 | order but are now listed consecutively en bloc. |
| 90 | "mot de passe" "Mot de passe") | 90 | "mot de passe" "Mot de passe") |
| 91 | Reported by Mor Zahavi <morzahavi@me.com>. (Bug#51271) | 91 | Reported by Mor Zahavi <morzahavi@me.com>. (Bug#51271) |
| 92 | * etc/refcards/fr-refcard.tex (section{Formater}): Remove mention | 92 | * etc/refcards/fr-refcard.tex (section{Formater}): Remove mention |
| 93 | Reported by Ture Pålsson. | 93 | 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 | |||
| 32 | ot | 32 | ot |
| 33 | parm | 33 | parm |
| 34 | parms | 34 | parms |
| 35 | proced | ||
| 35 | reenable | 36 | reenable |
| 36 | reenabled | 37 | reenabled |
| 37 | requestor | 38 | 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 @@ | |||
| 4890 | 4890 | ||
| 4891 | 2011-05-10 Jim Meyering <meyering@redhat.com> | 4891 | 2011-05-10 Jim Meyering <meyering@redhat.com> |
| 4892 | 4892 | ||
| 4893 | * minibuf.texi: Fix typo "in in -> in". | 4893 | * minibuf.texi: Fix typo. |
| 4894 | 4894 | ||
| 4895 | 2011-05-06 Paul Eggert <eggert@cs.ucla.edu> | 4895 | 2011-05-06 Paul Eggert <eggert@cs.ucla.edu> |
| 4896 | 4896 | ||
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. | |||
| 29 | @cindex root, of parsing expression grammar | 29 | @cindex root, of parsing expression grammar |
| 30 | @cindex entry-point, of parsing expression grammar | 30 | @cindex entry-point, of parsing expression grammar |
| 31 | Each rule in a @acronym{PEG} is referred to as a @dfn{parsing | 31 | Each rule in a @acronym{PEG} is referred to as a @dfn{parsing |
| 32 | expression} (@acronym{PEX}), and can be specified a a literal string, a | 32 | expression} (@acronym{PEX}), and can be specified a literal string, a |
| 33 | regexp-like character range or set, a peg-specific construct resembling | 33 | regexp-like character range or set, a peg-specific construct resembling |
| 34 | an Emacs Lisp function call, a reference to another rule, or a | 34 | an Emacs Lisp function call, a reference to another rule, or a |
| 35 | combination of any of these. A grammar is expressed as a tree of rules | 35 | 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 | |||
| 5128 | though part of a function. | 5128 | though part of a function. |
| 5129 | 5129 | ||
| 5130 | Note that the @code{requires} on Line 3 begins a @dfn{requires | 5130 | Note that the @code{requires} on Line 3 begins a @dfn{requires |
| 5131 | expression}, not a a requires clause, hence its components are not | 5131 | expression}, not a requires clause, hence its components are not |
| 5132 | assigned @code{constraint-cont}. See | 5132 | assigned @code{constraint-cont}. See |
| 5133 | @url{https://en.cppreference.com/w/cpp/language/requires}. | 5133 | @url{https://en.cppreference.com/w/cpp/language/requires}. |
| 5134 | 5134 | ||
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 56f259db9a1..b2dfc46f74c 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -20413,7 +20413,7 @@ Anyway, if you'd like to dig into it yourself, here's an example: | |||
| 20413 | (read-only nil) | 20413 | (read-only nil) |
| 20414 | (orphan -10) | 20414 | (orphan -10) |
| 20415 | (adapt t) | 20415 | (adapt t) |
| 20416 | (files "/hom/larsi/News/gnu.SCORE") | 20416 | (files "/home/larsi/News/gnu.SCORE") |
| 20417 | (exclude-files "all.SCORE") | 20417 | (exclude-files "all.SCORE") |
| 20418 | (local (gnus-newsgroup-auto-expire t) | 20418 | (local (gnus-newsgroup-auto-expire t) |
| 20419 | (gnus-summary-make-false-root empty)) | 20419 | (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 | |||
| 177 | =print_bibliography= keywords, were transformed according to the | 177 | =print_bibliography= keywords, were transformed according to the |
| 178 | chosen citation processor. | 178 | chosen citation processor. |
| 179 | 179 | ||
| 180 | This is no loner the case. All the citation-related markup is now | 180 | This is no longer the case. All the citation-related markup is now |
| 181 | exported as is. | 181 | exported as is. |
| 182 | 182 | ||
| 183 | The previous behavior can be reverted by setting new custom option | 183 | 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..." | |||
| 848 | `(org-example ((,class (:foreground "blue" :background "#EEFFEE")))) | 848 | `(org-example ((,class (:foreground "blue" :background "#EEFFEE")))) |
| 849 | `(org-footnote ((,class (:underline t :foreground "#008ED1")))) | 849 | `(org-footnote ((,class (:underline t :foreground "#008ED1")))) |
| 850 | `(org-formula ((,class (:foreground "chocolate1")))) | 850 | `(org-formula ((,class (:foreground "chocolate1")))) |
| 851 | ;; org-habit colours are thanks to zenburn | 851 | ;; org-habit colors are thanks to zenburn |
| 852 | `(org-habit-ready-face ((t :background "#7F9F7F"))) ; ,zenburn-green | 852 | `(org-habit-ready-face ((t :background "#7F9F7F"))) ; ,zenburn-green |
| 853 | `(org-habit-alert-face ((t :background "#E0CF9F" :foreground "#3F3F3F"))) ; ,zenburn-yellow-1 fg ,zenburn-bg | 853 | `(org-habit-alert-face ((t :background "#E0CF9F" :foreground "#3F3F3F"))) ; ,zenburn-yellow-1 fg ,zenburn-bg |
| 854 | `(org-habit-clear-face ((t :background "#5C888B"))) ; ,zenburn-blue-3 | 854 | `(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 @@ | |||
| 570 | 570 | ||
| 571 | 1986-01-18 Richard M. Stallman (rms@prep) | 571 | 1986-01-18 Richard M. Stallman (rms@prep) |
| 572 | 572 | ||
| 573 | * doctor.el: Fix typo "symtoms". | 573 | * doctor.el: Fix typo for "symptoms". |
| 574 | 574 | ||
| 575 | 1986-01-10 Richard Mlynarik (mly@prep) | 575 | 1986-01-10 Richard Mlynarik (mly@prep) |
| 576 | 576 | ||
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 920588abf89..586cb1cf23b 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el | |||
| @@ -622,7 +622,7 @@ Included databases are filtered based on `semanticdb-find-default-throttle'." | |||
| 622 | ;; INCLUDETAG should have some way to reference where it came | 622 | ;; INCLUDETAG should have some way to reference where it came |
| 623 | ;; from! If not, TABLE should provide the way. Each time we | 623 | ;; from! If not, TABLE should provide the way. Each time we |
| 624 | ;; look up a tag, we may need to find it in some relative way | 624 | ;; look up a tag, we may need to find it in some relative way |
| 625 | ;; and must set our current buffer eto the origin of includetag | 625 | ;; and must set our current buffer to the origin of includetag |
| 626 | ;; or nothing may work. | 626 | ;; or nothing may work. |
| 627 | (setq originfiledir | 627 | (setq originfiledir |
| 628 | (cond ((semantic-tag-file-name includetag) | 628 | (cond ((semantic-tag-file-name includetag) |
diff --git a/lisp/completion.el b/lisp/completion.el index 6c758e56eab..fff431eaf69 100644 --- a/lisp/completion.el +++ b/lisp/completion.el | |||
| @@ -992,7 +992,7 @@ Each symbol is bound to a single completion entry.") | |||
| 992 | ;; Updating the database | 992 | ;; Updating the database |
| 993 | ;;----------------------------------------------- | 993 | ;;----------------------------------------------- |
| 994 | ;; | 994 | ;; |
| 995 | ;; These are the internal functions used to update the datebase | 995 | ;; These are the internal functions used to update the database |
| 996 | ;; | 996 | ;; |
| 997 | ;; | 997 | ;; |
| 998 | (defvar completion-to-accept nil | 998 | (defvar completion-to-accept nil |
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) | |||
| 256 | to temporarily insert the contents of FILENAME. | 256 | to temporarily insert the contents of FILENAME. |
| 257 | 257 | ||
| 258 | Before executing BODY, narrow the buffer to the text for COMMAND | 258 | Before executing BODY, narrow the buffer to the text for COMMAND |
| 259 | and and set point to the beginning of the narrowed region. | 259 | and set point to the beginning of the narrowed region. |
| 260 | 260 | ||
| 261 | The value returned is the last form in BODY." | 261 | The value returned is the last form in BODY." |
| 262 | (declare (indent 1)) | 262 | (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 @@ | |||
| 5560 | 5560 | ||
| 5561 | 2011-05-10 Jim Meyering <meyering@redhat.com> | 5561 | 2011-05-10 Jim Meyering <meyering@redhat.com> |
| 5562 | 5562 | ||
| 5563 | * shr.el (shr-colorize-region): Fix typo "on on -> on". | 5563 | * shr.el (shr-colorize-region): Fix typo. |
| 5564 | 5564 | ||
| 5565 | 2011-05-10 Julien Danjou <julien@danjou.info> | 5565 | 2011-05-10 Julien Danjou <julien@danjou.info> |
| 5566 | 5566 | ||
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. | |||
| 2861 | 2861 | ||
| 2862 | If the optional TYPE is passed as `attachment' and the path is a | 2862 | If the optional TYPE is passed as `attachment' and the path is a |
| 2863 | descendant of the DEFAULT-DIRECTORY, the generated link will be | 2863 | descendant of the DEFAULT-DIRECTORY, the generated link will be |
| 2864 | specified as an an \"attachment:\" style link." | 2864 | specified as an \"attachment:\" style link." |
| 2865 | (when (stringp result) | 2865 | (when (stringp result) |
| 2866 | (let* ((result-file-name (expand-file-name result)) | 2866 | (let* ((result-file-name (expand-file-name result)) |
| 2867 | (base-file-name (buffer-file-name (buffer-base-buffer))) | 2867 | (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'." | |||
| 105 | 105 | ||
| 106 | (defcustom org-indent-post-buffer-init-functions nil | 106 | (defcustom org-indent-post-buffer-init-functions nil |
| 107 | "Hook run after org-indent finishes initializing a buffer. | 107 | "Hook run after org-indent finishes initializing a buffer. |
| 108 | The function(s) in in this hook must accept a single argument representing | 108 | The function(s) in this hook must accept a single argument representing |
| 109 | the initialized buffer." | 109 | the initialized buffer." |
| 110 | :group 'org-indent | 110 | :group 'org-indent |
| 111 | :package-version '(Org . "9.7") | 111 | :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 | |||
| 15434 | (defun org-modify-ts-extra (ts-string pos nincrements increment-step) | 15434 | (defun org-modify-ts-extra (ts-string pos nincrements increment-step) |
| 15435 | "Change the lead-time/repeat fields at POS in timestamp string TS-STRING. | 15435 | "Change the lead-time/repeat fields at POS in timestamp string TS-STRING. |
| 15436 | POS is the position in the timestamp string to be changed. | 15436 | POS is the position in the timestamp string to be changed. |
| 15437 | NINCREMENTS is the number of incremenets/decrements. | 15437 | NINCREMENTS is the number of increments/decrements. |
| 15438 | 15438 | ||
| 15439 | INCREMENT-STEP is step used for a single increment when POS in on | 15439 | INCREMENT-STEP is step used for a single increment when POS in on |
| 15440 | minutes. Before incrementing minutes, they are rounded to | 15440 | 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." | |||
| 1954 | ;; The following is no longer used (2020-02-16). | 1954 | ;; The following is no longer used (2020-02-16). |
| 1955 | ;; (c-lang-defconst c-last-open-c-comment-start-on-line-re | 1955 | ;; (c-lang-defconst c-last-open-c-comment-start-on-line-re |
| 1956 | ;; "Regexp which matches the last block comment start on the | 1956 | ;; "Regexp which matches the last block comment start on the |
| 1957 | ;; current ine, if any, or nil in those languages without block | 1957 | ;; current one, if any, or nil in those languages without block |
| 1958 | ;; comments. When a match is found, submatch 1 contains the comment | 1958 | ;; comments. When a match is found, submatch 1 contains the comment |
| 1959 | ;; starter." | 1959 | ;; starter." |
| 1960 | ;; t "\\(/\\*\\)\\([^*]\\|\\*+\\([^*/]\\|$\\)\\)*$" | 1960 | ;; 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 | |||
| 347 | DEFVAR forms reset the variables to the init values." | 347 | DEFVAR forms reset the variables to the init values." |
| 348 | (save-excursion | 348 | (save-excursion |
| 349 | ;; Find the end of the defun this way to avoid having the region | 349 | ;; Find the end of the defun this way to avoid having the region |
| 350 | ;; possibly end with a comment (it there'a a comment after the | 350 | ;; possibly end with a comment (it there's a comment after the |
| 351 | ;; final parenthesis). | 351 | ;; final parenthesis). |
| 352 | (beginning-of-defun) | 352 | (beginning-of-defun) |
| 353 | (forward-sexp) | 353 | (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." | |||
| 717 | (c-ts-common-comment-2nd-line-matcher | 717 | (c-ts-common-comment-2nd-line-matcher |
| 718 | c-ts-common-comment-2nd-line-anchor | 718 | c-ts-common-comment-2nd-line-anchor |
| 719 | 1))) | 719 | 1))) |
| 720 | "Tree-sitter indentation rules for for `phpdoc'.") | 720 | "Tree-sitter indentation rules for `phpdoc'.") |
| 721 | 721 | ||
| 722 | 722 | ||
| 723 | ;;; Font-lock | 723 | ;;; Font-lock |
| @@ -1561,7 +1561,7 @@ The optional TYPE can be the symbol \"port\", \"hostname\", \"document-root\" or | |||
| 1561 | (defun run-php (&optional cmd config) | 1561 | (defun run-php (&optional cmd config) |
| 1562 | "Run an PHP interpreter as a inferior process. | 1562 | "Run an PHP interpreter as a inferior process. |
| 1563 | 1563 | ||
| 1564 | Arguments CMD an CONFIG, default to `php-ts-mode-php-executable' | 1564 | Arguments CMD and CONFIG, default to `php-ts-mode-php-executable' |
| 1565 | and `php-ts-mode-php-config' respectively, control which PHP interpreter is run. | 1565 | and `php-ts-mode-php-config' respectively, control which PHP interpreter is run. |
| 1566 | Prompt for CMD if `php-ts-mode-php-executable' is nil. | 1566 | Prompt for CMD if `php-ts-mode-php-executable' is nil. |
| 1567 | Optional CONFIG, if supplied, is the php.ini file to use." | 1567 | 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." | |||
| 1418 | (with-syntax-table sgml-tag-syntax-table | 1418 | (with-syntax-table sgml-tag-syntax-table |
| 1419 | (let ((pos (point))) | 1419 | (let ((pos (point))) |
| 1420 | (condition-case nil | 1420 | (condition-case nil |
| 1421 | ;; FIXME: This does not correctly skip over PI an CDATA tags. | 1421 | ;; FIXME: This does not correctly skip over PI and CDATA tags. |
| 1422 | (sgml-forward-sexp 1) | 1422 | (sgml-forward-sexp 1) |
| 1423 | (scan-error | 1423 | (scan-error |
| 1424 | ;; This < seems to be just a spurious one, let's ignore it. | 1424 | ;; 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. | |||
| 1052 | In the second case, the second string is used to provide a longer | 1052 | In the second case, the second string is used to provide a longer |
| 1053 | name for the keys under a prefix. | 1053 | name for the keys under a prefix. |
| 1054 | 1054 | ||
| 1055 | MORE allows you to specifcy additional KEY REPLACEMENT pairs. All | 1055 | MORE allows you to specify additional KEY REPLACEMENT pairs. All |
| 1056 | replacements are added to `which-key-replacement-alist'." | 1056 | replacements are added to `which-key-replacement-alist'." |
| 1057 | ;; TODO: Make interactive | 1057 | ;; TODO: Make interactive |
| 1058 | (while key-sequence | 1058 | (while key-sequence |
| @@ -1923,7 +1923,7 @@ Requires `which-key-compute-remaps' to be non-nil." | |||
| 1923 | PREFIX limits bindings to those starting with this key | 1923 | PREFIX limits bindings to those starting with this key |
| 1924 | sequence. START is a list of existing bindings to add to. If ALL | 1924 | sequence. START is a list of existing bindings to add to. If ALL |
| 1925 | is non-nil, recursively retrieve all bindings below PREFIX. If | 1925 | is non-nil, recursively retrieve all bindings below PREFIX. If |
| 1926 | EVIL is non-nil, extract active evil bidings." | 1926 | EVIL is non-nil, extract active evil bindings." |
| 1927 | (let ((bindings start) | 1927 | (let ((bindings start) |
| 1928 | (ignore '(self-insert-command ignore ignore-event company-ignore)) | 1928 | (ignore '(self-insert-command ignore ignore-event company-ignore)) |
| 1929 | (evil-map | 1929 | (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 @@ | |||
| 5956 | Assume C89 or later for math functions (Bug#12381). | 5956 | Assume C89 or later for math functions (Bug#12381). |
| 5957 | This simplifies the code, and makes it a bit smaller and faster, | 5957 | This simplifies the code, and makes it a bit smaller and faster, |
| 5958 | and (most important) makes it easier to clean up signal handling | 5958 | and (most important) makes it easier to clean up signal handling |
| 5959 | since we can stop worring about floating-point exceptions in | 5959 | since we can stop worrying about floating-point exceptions in |
| 5960 | library code. That was a problem before C89, but the problem | 5960 | library code. That was a problem before C89, but the problem |
| 5961 | went away many years ago on all practical Emacs targets. | 5961 | went away many years ago on all practical Emacs targets. |
| 5962 | * data.c, image.c, lread.c, print.c: | 5962 | * 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) | |||
| 605 | 605 | ||
| 606 | DEFUN ("w32image-create-thumbnail", Fw32image_create_thumbnail, | 606 | DEFUN ("w32image-create-thumbnail", Fw32image_create_thumbnail, |
| 607 | Sw32image_create_thumbnail, 5, 5, 0, | 607 | Sw32image_create_thumbnail, 5, 5, 0, |
| 608 | doc: /* Create a HEIGHT by WIDTH thumnail file THUMB-FILE for image INPUT-FILE. | 608 | doc: /* Create a HEIGHT by WIDTH thumbnail file THUMB-FILE for image INPUT-FILE. |
| 609 | TYPE is the image type to use for the thumbnail file, a string. It is | 609 | TYPE is the image type to use for the thumbnail file, a string. It is |
| 610 | usually identical to the file-name extension of THUMB-FILE, but without | 610 | usually identical to the file-name extension of THUMB-FILE, but without |
| 611 | the leading period, and both "jpeg" and "jpg" can be used for JPEG. | 611 | 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; | |||
| 8 | $printed = 1; | 8 | $printed = 1; |
| 9 | 9 | ||
| 10 | # With cperl-extra-delimiters-mode=on the previous lines are a label | 10 | # With cperl-extra-delimiters-mode=on the previous lines are a label |
| 11 | # and a a print statement. This line here is a comment. Without | 11 | # and a print statement. This line here is a comment. Without |
| 12 | # cperl-extra-delimiters-mode, all this is part of the variable | 12 | # cperl-extra-delimiters-mode, all this is part of the variable |
| 13 | # declaration. | 13 | # declaration. |
| 14 | 14 | ||
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 | |||
| 201 | 201 | ||
| 202 | 202 | ||
| 203 | (ert-deftest ses-jump-B2-lowcase () | 203 | (ert-deftest ses-jump-B2-lowcase () |
| 204 | "Test jumping to cell B2 by use of lowcase cell name string" | 204 | "Test jumping to cell B2 by use of lowercase cell name string" |
| 205 | (let ((ses-initial-size '(3 . 3)) | 205 | (let ((ses-initial-size '(3 . 3)) |
| 206 | ses-after-entry-functions) | 206 | ses-after-entry-functions) |
| 207 | (with-temp-buffer | 207 | (with-temp-buffer |
| @@ -211,7 +211,7 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to | |||
| 211 | (should (eq (ses--cell-at-pos (point)) 'B2))))) | 211 | (should (eq (ses--cell-at-pos (point)) 'B2))))) |
| 212 | 212 | ||
| 213 | (ert-deftest ses-jump-B2-lowcase-keys () | 213 | (ert-deftest ses-jump-B2-lowcase-keys () |
| 214 | "Test jumping to cell B2 by use of lowcase cell name string with simulating keys" | 214 | "Test jumping to cell B2 by use of lowercase cell name string with simulating keys" |
| 215 | (let ((ses-initial-size '(3 . 3)) | 215 | (let ((ses-initial-size '(3 . 3)) |
| 216 | ses-after-entry-functions) | 216 | ses-after-entry-functions) |
| 217 | (with-temp-buffer | 217 | (with-temp-buffer |