aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2024-06-16 21:59:42 +0200
committerStefan Kangas2024-06-16 22:38:26 +0200
commitc0eefebabfee011f0ec7631d055e482e4965a24d (patch)
treeca50616f960b0a16c7c79fe406c01b016e156e1c
parent90234ba7f024f3dae342689b47930835e4904503 (diff)
downloademacs-c0eefebabfee011f0ec7631d055e482e4965a24d.tar.gz
emacs-c0eefebabfee011f0ec7631d055e482e4965a24d.zip
; Fix typos
-rw-r--r--ChangeLog.334
-rw-r--r--ChangeLog.410
-rw-r--r--admin/codespell/codespell.dictionary5
-rw-r--r--admin/codespell/codespell.exclude73
-rw-r--r--admin/codespell/codespell.ignore1
-rwxr-xr-xadmin/make-manuals2
-rw-r--r--doc/lispref/help.texi2
-rw-r--r--doc/misc/calc.texi2
-rw-r--r--doc/misc/modus-themes.org4
-rw-r--r--doc/misc/org.org2
-rw-r--r--java/Makefile.in4
-rw-r--r--lisp/ChangeLog.62
-rw-r--r--lisp/calendar/calendar.el2
-rw-r--r--lisp/cedet/semantic/complete.el2
-rw-r--r--lisp/erc/ChangeLog.12
-rw-r--r--lisp/external-completion.el2
-rw-r--r--lisp/gnus/ChangeLog.24
-rw-r--r--lisp/jsonrpc.el2
-rw-r--r--lisp/net/ange-ftp.el2
-rw-r--r--lisp/org/ChangeLog.12
-rw-r--r--lisp/org/oc-basic.el2
-rw-r--r--lisp/org/org-faces.el2
-rw-r--r--lisp/org/ox.el2
-rw-r--r--lisp/progmodes/bug-reference.el2
-rw-r--r--lisp/progmodes/peg.el2
-rw-r--r--lisp/progmodes/php-ts-mode.el16
-rw-r--r--lisp/startup.el2
-rw-r--r--lisp/window.el2
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/fns.c2
-rw-r--r--src/fontset.c2
31 files changed, 132 insertions, 63 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3
index 46fc57cd0c0..1398b9bcf53 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -11216,7 +11216,7 @@
11216 11216
11217 Rename flymake--backend-state to flymake--state 11217 Rename flymake--backend-state to flymake--state
11218 11218
11219 The previous name was confusing and akward and dreadful to type and 11219 The previous name was confusing and awkward and dreadful to type and
11220 read. 11220 read.
11221 11221
11222 * lisp/progmodes/flymake.el (flymake--state): Rename from 11222 * lisp/progmodes/flymake.el (flymake--state): Rename from
@@ -28256,7 +28256,7 @@
28256 We used to `bset_enable_multibyte_characters` while the buffer is not 28256 We used to `bset_enable_multibyte_characters` while the buffer is not
28257 empty, putting the buffer temporarily in an inconsistent state. 28257 empty, putting the buffer temporarily in an inconsistent state.
28258 28258
28259 Further simplifications along the way: Prefer re-using local var `histvar` 28259 Further simplifications along the way: Prefer reusing local var `histvar`
28260 and let `insert` do the unibyte<->multibyte conversion if needed. 28260 and let `insert` do the unibyte<->multibyte conversion if needed.
28261 28261
282622021-04-20 Eli Zaretskii <eliz@gnu.org> 282622021-04-20 Eli Zaretskii <eliz@gnu.org>
@@ -50574,7 +50574,7 @@
50574 Make XEmacs entry in the FAQ more contemporary 50574 Make XEmacs entry in the FAQ more contemporary
50575 50575
50576 * doc/misc/efaq.texi (Difference between Emacs and XEmacs): Make 50576 * doc/misc/efaq.texi (Difference between Emacs and XEmacs): Make
50577 XEmacs entry in the FAQ more contemporary. Remove part about re-using 50577 XEmacs entry in the FAQ more contemporary. Remove part about reusing
50578 XEmacs code; this is not likely to be relevant these days and in any 50578 XEmacs code; this is not likely to be relevant these days and in any
50579 case is not a frequently asked question. (Bug#45235) 50579 case is not a frequently asked question. (Bug#45235)
50580 50580
@@ -83494,7 +83494,7 @@
83494 6b297519b5 Fix cl-most-positive-float doc typo 83494 6b297519b5 Fix cl-most-positive-float doc typo
83495 c36c5a3ded ; lisp/ldefs-boot.el: Update. 83495 c36c5a3ded ; lisp/ldefs-boot.el: Update.
83496 3876a60569 Fix a typo in calculator.el 83496 3876a60569 Fix a typo in calculator.el
83497 9e832ba91b * lisp/erc/erc.el: Add URL to the new ERC page on the Emac... 83497 9e832ba91b * lisp/erc/erc.el: Add URL to the new ERC page on the Emacs...
83498 83498
83499 # Conflicts: 83499 # Conflicts:
83500 # etc/NEWS 83500 # etc/NEWS
@@ -128371,7 +128371,7 @@
128371 128371
128372 Merge from origin/emacs-26 128372 Merge from origin/emacs-26
128373 128373
128374 9254885 (origin/emacs-26) Resurrect display-line-number-mode in clien... 128374 9254885 (origin/emacs-26) Resurrect display-line-number-mode in client...
128375 aecbbd5 * src/fns.c (Fmapconcat): Doc fix. (Bug#35710) 128375 aecbbd5 * src/fns.c (Fmapconcat): Doc fix. (Bug#35710)
128376 8e5fc38 Fix typo 128376 8e5fc38 Fix typo
128377 ee21b40 * lisp/term/w32-win.el ([noname]): Bind to 'ignore'. (Bug#36... 128377 ee21b40 * lisp/term/w32-win.el ([noname]): Bind to 'ignore'. (Bug#36...
@@ -134042,7 +134042,7 @@
134042 134042
134043 9d7e08d (origin/emacs-26) Avoid false positives and false negatives o... 134043 9d7e08d (origin/emacs-26) Avoid false positives and false negatives o...
134044 75b589c Fix markup related to quoting in Info 134044 75b589c Fix markup related to quoting in Info
134045 fd6ff29 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 134045 fd6ff29 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs...
134046 cd2204f Add a package: line to c-submit-bug-report. 134046 cd2204f Add a package: line to c-submit-bug-report.
134047 a992dca ; Remove empty NEWS sections 134047 a992dca ; Remove empty NEWS sections
134048 ea67270 ; Add NEWS sections for 26.3 134048 ea67270 ; Add NEWS sections for 26.3
@@ -148868,7 +148868,7 @@
148868 2c8ea46 Revert "* etc/NEWS: Note setting make-cursor-line-fully-visib... 148868 2c8ea46 Revert "* etc/NEWS: Note setting make-cursor-line-fully-visib...
148869 f8df6f2 * etc/NEWS: Note setting make-cursor-line-fully-visible to ni... 148869 f8df6f2 * etc/NEWS: Note setting make-cursor-line-fully-visible to ni...
148870 cdca208 Fix note about interactive advice (Bug#32905) 148870 cdca208 Fix note about interactive advice (Bug#32905)
148871 508c40e Comple fix for Bug#32550 148871 508c40e Complete fix for Bug#32550
148872 148872
1488732018-10-03 Glenn Morris <rgm@gnu.org> 1488732018-10-03 Glenn Morris <rgm@gnu.org>
148874 148874
@@ -157301,7 +157301,7 @@
157301 157301
157302 Merge from origin/emacs-26 157302 Merge from origin/emacs-26
157303 157303
157304 76f692e Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 157304 76f692e Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs...
157305 157305
1573062018-06-02 Glenn Morris <rgm@gnu.org> 1573062018-06-02 Glenn Morris <rgm@gnu.org>
157307 157307
@@ -157310,7 +157310,7 @@
157310 90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit 157310 90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit
157311 af82d1f * etc/PROBLEMS: Document stickiness problem with FVWM (Bug#31... 157311 af82d1f * etc/PROBLEMS: Document stickiness problem with FVWM (Bug#31...
157312 4a3aed2 Update Emacs Lisp Intro to match current behavior 157312 4a3aed2 Update Emacs Lisp Intro to match current behavior
157313 21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 157313 21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs...
157314 3257085 Fix previous commit 157314 3257085 Fix previous commit
157315 6d23525 Fix typos in several manuals (Bug#31610) 157315 6d23525 Fix typos in several manuals (Bug#31610)
157316 9188291 Add detailed documentation about lock files 157316 9188291 Add detailed documentation about lock files
@@ -159803,7 +159803,7 @@
159803 ad731b0 ; * doc/lispref/display.texi (Temporary Displays): Fix typos. 159803 ad731b0 ; * doc/lispref/display.texi (Temporary Displays): Fix typos.
159804 f1450e9 Complete documentation of syntax flags by adding `c' 159804 f1450e9 Complete documentation of syntax flags by adding `c'
159805 6bdcaec Fix typos and minor wording issues in ELisp manual 159805 6bdcaec Fix typos and minor wording issues in ELisp manual
159806 febac27 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 159806 febac27 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs...
159807 6c2e21e Avoid segfault in processes of type 'pipe' 159807 6c2e21e Avoid segfault in processes of type 'pipe'
159808 60e10c5 Remove repetitions in documentation strings 159808 60e10c5 Remove repetitions in documentation strings
159809 208e752 * lisp/image.el (image-load-path): Doc fix. 159809 208e752 * lisp/image.el (image-load-path): Doc fix.
@@ -162780,7 +162780,7 @@
162780 d523e4a Remove some unused spam.el variables 162780 d523e4a Remove some unused spam.el variables
162781 501808c Replace some obsolete aliases in code 162781 501808c Replace some obsolete aliases in code
162782 19afff3 Replace some obsolete aliases in documentation 162782 19afff3 Replace some obsolete aliases in documentation
162783 c797bc9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 162783 c797bc9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs...
162784 0efe0bd Obsolete eshell-cmpl-suffix-list 162784 0efe0bd Obsolete eshell-cmpl-suffix-list
162785 add48d2 More minor changes in the Glossary of the Emacs manual 162785 add48d2 More minor changes in the Glossary of the Emacs manual
162786 f6bd7e0 Revert last commit 162786 f6bd7e0 Revert last commit
@@ -163219,7 +163219,7 @@
163219 fd50238 (origin/emacs-26) * doc/lispref/streams.texi (Output Variable... 163219 fd50238 (origin/emacs-26) * doc/lispref/streams.texi (Output Variable...
163220 769ea57 Use "GTK+" where applicable in the manual 163220 769ea57 Use "GTK+" where applicable in the manual
163221 5e69219 Document print-escape-control-characters 163221 5e69219 Document print-escape-control-characters
163222 c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 163222 c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs...
163223 a2ab0d0 * doc/emacs/killing.texi (Rectangles): Don't use @key for cha... 163223 a2ab0d0 * doc/emacs/killing.texi (Rectangles): Don't use @key for cha...
163224 6288c3d * lisp/emulation/viper.el: Unbreak it. 163224 6288c3d * lisp/emulation/viper.el: Unbreak it.
163225 bf3535e More fixes in the Emacs manual 163225 bf3535e More fixes in the Emacs manual
@@ -163800,7 +163800,7 @@
163800 593bbda Document comment-fill-column in the manual (Bug#11636) 163800 593bbda Document comment-fill-column in the manual (Bug#11636)
163801 bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 163801 bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
163802 69107f3 ; Fix doc typos related to indefinite articles 163802 69107f3 ; Fix doc typos related to indefinite articles
163803 aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 163803 aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs...
163804 5906418 More fixes for the Emacs manual 163804 5906418 More fixes for the Emacs manual
163805 9ab3df1 ; Fix doc typos related to indefinite articles 163805 9ab3df1 ; Fix doc typos related to indefinite articles
163806 66a4e65 ; Fix doc typos related to indefinite articles 163806 66a4e65 ; Fix doc typos related to indefinite articles
@@ -174726,7 +174726,7 @@
174726 174726
1747272018-10-01 Michael Albinus <michael.albinus@gmx.de> 1747272018-10-01 Michael Albinus <michael.albinus@gmx.de>
174728 174728
174729 Comple fix for Bug#32550 174729 Complete fix for Bug#32550
174730 174730
174731 * lisp/net/tramp.el (tramp-rfn-eshadow-update-overlay): 174731 * lisp/net/tramp.el (tramp-rfn-eshadow-update-overlay):
174732 Use `save-excursion'. This completes the fix of Bug#32550. 174732 Use `save-excursion'. This completes the fix of Bug#32550.
@@ -217743,7 +217743,7 @@
217743 baa8ba4 * lisp/subr.el (start-process): Doc fix. (Bug#24693) 217743 baa8ba4 * lisp/subr.el (start-process): Doc fix. (Bug#24693)
217744 e535ca4 Fix display of vc-dir CVS file statuses in subdirectories 217744 e535ca4 Fix display of vc-dir CVS file statuses in subdirectories
217745 12da149 Update URL of MS-Windows optional DLLs 217745 12da149 Update URL of MS-Windows optional DLLs
217746 2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... 217746 2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs...
217747 a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)... 217747 a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)...
217748 b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f... 217748 b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f...
217749 cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case. (B... 217749 cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case. (B...
@@ -220415,7 +220415,7 @@
220415 5ccd593 ; Fix typo in /etc/NEWS 220415 5ccd593 ; Fix typo in /etc/NEWS
220416 96e3d16 * etc/NEWS: Mention the change in json-encode-string. 220416 96e3d16 * etc/NEWS: Mention the change in json-encode-string.
220417 2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create... 220417 2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create...
220418 2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... 220418 2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs...
220419 66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe... 220419 66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...
220420 220420
220421 # Conflicts: 220421 # Conflicts:
@@ -228688,7 +228688,7 @@
228688 3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings. 228688 3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings.
228689 a1f221b Comint and compile no longer set EMACS 228689 a1f221b Comint and compile no longer set EMACS
228690 5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2... 228690 5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2...
228691 a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... 228691 a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs...
228692 c93ae7a Allow to customize names of executables used by grep.el 228692 c93ae7a Allow to customize names of executables used by grep.el
228693 f6497c6 Set locale encoding to UTF-8 when run from OS X GUI. 228693 f6497c6 Set locale encoding to UTF-8 when run from OS X GUI.
228694 7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt 228694 7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
diff --git a/ChangeLog.4 b/ChangeLog.4
index a9450fdba6c..fa55bc0fe55 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -7999,7 +7999,7 @@
7999 Given an inlay hints at position POS, its attached to [POS, POS+1] if 7999 Given an inlay hints at position POS, its attached to [POS, POS+1] if
8000 it's kind=1 (usually type hints) and [POS-1, POS] otherwise. For 8000 it's kind=1 (usually type hints) and [POS-1, POS] otherwise. For
8001 kind=1 hints, the 'cursor position of the first such overlay is also 8001 kind=1 hints, the 'cursor position of the first such overlay is also
8002 tweaked, so that's it's less akward to edit around it. 8002 tweaked, so that's it's less awkward to edit around it.
8003 8003
8004 * lisp/progmodes/eglot.el (eglot--before-change): Don't delete hints 8004 * lisp/progmodes/eglot.el (eglot--before-change): Don't delete hints
8005 here. 8005 here.
@@ -35893,7 +35893,7 @@
35893 Merge from origin/emacs-28 35893 Merge from origin/emacs-28
35894 35894
35895 395760dcd3 Update ChangeLog and AUTHORS for Emacs 28.2 35895 395760dcd3 Update ChangeLog and AUTHORS for Emacs 28.2
35896 ddabb03a01 * doc/misc/idlwave.texi (Troubleshooting): Don't say "Emac... 35896 ddabb03a01 * doc/misc/idlwave.texi (Troubleshooting): Don't say "Emacs...
35897 724444f3d5 ; * doc/emacs/misc.texi (emacsclient Options): Fix typo. 35897 724444f3d5 ; * doc/emacs/misc.texi (emacsclient Options): Fix typo.
35898 b96257162d Don't mention very old Emacs versions in docs 35898 b96257162d Don't mention very old Emacs versions in docs
35899 35899
@@ -56282,7 +56282,7 @@
56282 56282
562832022-06-14 Mattias Engdegård <mattiase@acm.org> 562832022-06-14 Mattias Engdegård <mattiase@acm.org>
56284 56284
56285 Simplify byte-compiler assuming cconv normalisations 56285 Simplify byte-compiler assuming cconv normalizations
56286 56286
56287 * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker) 56287 * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker)
56288 (byte-optimize-let-form, byte-optimize-letX): 56288 (byte-optimize-let-form, byte-optimize-letX):
@@ -56296,7 +56296,7 @@
56296 56296
56297 Make cconv work for dynamically bound code and always run it. 56297 Make cconv work for dynamically bound code and always run it.
56298 This allows later stages to benefit from transformations and 56298 This allows later stages to benefit from transformations and
56299 normalisations in cconv. 56299 normalizations in cconv.
56300 56300
56301 * lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): Always run 56301 * lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): Always run
56302 cconv. 56302 cconv.
@@ -104223,7 +104223,7 @@
104223 Merge from origin/emacs-28 104223 Merge from origin/emacs-28
104224 104224
104225 f1c9286 ; * doc/misc/org.org: fix capture context example 104225 f1c9286 ; * doc/misc/org.org: fix capture context example
104226 af67ce6 Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emac... 104226 af67ce6 Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs...
104227 610680a Fix rendering of title-less <abbr> tags in shr 104227 610680a Fix rendering of title-less <abbr> tags in shr
104228 2ba4ccf ; * lisp/files.el (make-nearby-temp-file): Doc fix. 104228 2ba4ccf ; * lisp/files.el (make-nearby-temp-file): Doc fix.
104229 104229
diff --git a/admin/codespell/codespell.dictionary b/admin/codespell/codespell.dictionary
index 59065fbf8e2..df6085feac8 100644
--- a/admin/codespell/codespell.dictionary
+++ b/admin/codespell/codespell.dictionary
@@ -1,6 +1,5 @@
1alis->alist, alias, alas, axis, alms, 1alis->alist, alias, alas, axis, alms,
2boostrap-clean->bootstrap-clean 2boostrap-clean->bootstrap-clean
3brunches->branches
4defalis->defalias 3defalis->defalias
5defalises->defaliases 4defalises->defaliases
6ecmacs->emacs 5ecmacs->emacs
@@ -8,10 +7,6 @@ ehsell->eshell
8emcs->emacs 7emcs->emacs
9file-writeable-p->file-writable-p 8file-writeable-p->file-writable-p
10finis->finish 9finis->finish
11firs->first
12hep->help
13least-favourite->least-favorite 10least-favourite->least-favorite
14lien->line
15liens->lines
16mecas->emacs 11mecas->emacs
17sehell->eshell, shell, 12sehell->eshell, shell,
diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index 1f036478965..f01302b7931 100644
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -1611,3 +1611,76 @@ Optional DETECTIN is an autoload cons from `ede-detect-directory-for-project'
1611 '("\\(?:Entering\\|Leavin\\(g\\)\\) directory [`']\\(.+\\)'$" (2 . 1)) 1611 '("\\(?:Entering\\|Leavin\\(g\\)\\) directory [`']\\(.+\\)'$" (2 . 1))
1612 "dropping" "fillin" "from" "granularity" "hppp" "inwindow" 1612 "dropping" "fillin" "from" "granularity" "hppp" "inwindow"
1613 (".G1" . ".G2") ; grap 1613 (".G1" . ".G2") ; grap
1614 (let ((tagret nil)
1615 (setq tagret (cons ans tagret))
1616 (setq tagret (append ans tagret)))
1617 tagret))
1618 (setq tagret ans)
1619 (setq tagret (car ans)))
1620 (cons objret tagret)))
1621 (prevend (track-changes--state-end state))
1622 (setq end prevend)
1623 (when (< endb prevend)
1624 (let ((new-end (+ end (- prevend endb))))
1625 (cl-assert (= prevend (+ beg lenbefore)))
1626 (cl-assert (<= beg prevbeg prevend endb))
1627 (- endb prevend)))
1628 (- endb prevend)))))
1629 ;; etc... whereas "real" declmods are valid for all types, buildin
1630 outin = ina | inb | \\=`constant;
1631 out = outin;
1632 comin comstart)
1633 (setq comin (point))
1634 (buffer-substring comstart comin))))
1635 (comment-string-strip (buffer-substring comstart comin) nil t))
1636 (buffer-substring (point) comin))
1637 (buffer-substring (line-beginning-position) comin))))
1638;; designate them are: eqn (e), grap (g), pic (p), tbl (t), vgrind
1639 FLUSHO and PENDIN.
1640 fo: { [x: any]: any } = {
1641 "\\<\\(?:\\(?:fals\\|tru\\)e\\)\\>")
1642 (search-forward "tru")
1643 (search-forward "Tru")
1644 (" fo.ba@example.com" 6 email "fo.ba@example.com")
1645 "t" "tr" "tru" "truE" "truee"
1646 "f" "fa" "fal" "fals" "falsE" "falsee"))
1647 int eventState, notIn;
1648 notIn = (down ? eventState & ~lastButtonState
1649 if ((notIn & (MotionEvent.BUTTON_PRIMARY
1650 if ((notIn & MotionEvent.BUTTON_PRIMARY) != 0)
1651 if ((notIn & MotionEvent.BUTTON_SECONDARY) != 0)
1652 if ((notIn & MotionEvent.BUTTON_TERTIARY) != 0)
1653 if ((notIn & MotionEvent.BUTTON_BACK) != 0)
1654 if ((notIn & MotionEvent.BUTTON_FORWARD) != 0)
1655 if ((notIn & MotionEvent.BUTTON_STYLUS_PRIMARY) != 0)
1656 if ((notIn & MotionEvent.BUTTON_STYLUS_SECONDARY) != 0)
1657argument \\='general-category, is Decimal_Numbers (Nd). It returns
1658 (let (compos comin)
1659 (setq comin (point))))))
1660 (setq comin (point))))
1661 (let* ((comstart (buffer-substring compos comin))
1662 (te (float-time
1663 (dt (- (if tend (min te tend) te)
16642022-04-20 Jean Abou Samra <jean@abou-samra.fr> (tiny change)
1665(string< "abc" "abd")
1666(string< "abd" "abc")
1667;; ("a") ("ab") ("abc") ("abd") ("abf") ("zab") ("acb")
1668;; `«(my-face)U:abd»'.
1669;; `«(my-fibonacci-property):(1 1 2 3 5 8):abd»'.
1670 :eval (string-collate-lessp "abc" "abd"))
1671 :eval (string-lessp "abc" "abd")
1672 :eval (string-greaterp "abd" "abc")
1673 :eval (string-collate-lessp "abc" "abd")))
1674 `(("abc" < "abd")
1675 (abc < "abd")
1676 (abc < abd)
1677 ("abc" < ,(string-to-multibyte "abd"))
1678 (,(string-to-multibyte "abc") < "abd")
1679 (,(string-to-multibyte "abc") < ,(string-to-multibyte "abd"))
1680 ("" . "a") ("a" . "b") ("A" . "a") ("abc" . "abd")
16812004-05-05 Stephen Eglen <stephen@anc.ed.ac.uk>
1682;; location: http://www.anc.ed.ac.uk/~stephen/emacs/
1683 :link '(url-link "https://www.anc.ed.ac.uk/~stephen/emacs/")
1684 ((or (string-equal tag "anc") (string-equal tag "ancestor"))
1685 ("ro" :default "Continuare de pe pagina precedentă")
1686 ("ro" :default "Continuare pe pagina următoare")
diff --git a/admin/codespell/codespell.ignore b/admin/codespell/codespell.ignore
index 4f6135ca39a..02bd6d05838 100644
--- a/admin/codespell/codespell.ignore
+++ b/admin/codespell/codespell.ignore
@@ -1,4 +1,5 @@
1acknowledgements 1acknowledgements
2advices
2afile 3afile
3ake 4ake
4analogue 5analogue
diff --git a/admin/make-manuals b/admin/make-manuals
index 477daa09a4c..833849922e5 100755
--- a/admin/make-manuals
+++ b/admin/make-manuals
@@ -95,7 +95,7 @@ tempfile="$(emacs_mktemp)"
95 95
96if [ -e $outdir ]; then 96if [ -e $outdir ]; then
97 ## Speed up repeat invocation. 97 ## Speed up repeat invocation.
98 echo "Re-using existing $outdir/ directory" 98 echo "Reusing existing $outdir/ directory"
99 99
100else 100else
101 101
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index 4ddd84f470e..f3d12feefc6 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -334,7 +334,7 @@ stands for a key sequence that will invoke @var{command}, or @samp{M-x
334@item \@{@var{mapvar}@} 334@item \@{@var{mapvar}@}
335stands for a summary of the keymap which is the value of the variable 335stands for a summary of the keymap which is the value of the variable
336@var{mapvar}. The summary is made using @code{describe-bindings}. 336@var{mapvar}. The summary is made using @code{describe-bindings}.
337The summary will normally exclude meny bindings, but if the 337The summary will normally exclude menu bindings, but if the
338@var{include-menus} argument to @code{substitute-command-keys} is 338@var{include-menus} argument to @code{substitute-command-keys} is
339non-@code{nil}, the menu bindings will be included. 339non-@code{nil}, the menu bindings will be included.
340 340
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 56ebc589960..381da21cebe 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -18973,7 +18973,7 @@ number between zero and one. It is equivalent to @samp{random(1.0)}.
18973@kindex k a 18973@kindex k a
18974@pindex calc-random-again 18974@pindex calc-random-again
18975The @kbd{k a} (@code{calc-random-again}) command produces another random 18975The @kbd{k a} (@code{calc-random-again}) command produces another random
18976number, re-using the most recent value of @expr{M}. With a numeric 18976number, reusing the most recent value of @expr{M}. With a numeric
18977prefix argument @var{n}, it produces @var{n} more random numbers using 18977prefix argument @var{n}, it produces @var{n} more random numbers using
18978that value of @expr{M}. 18978that value of @expr{M}.
18979 18979
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 3e353dc356d..fb1df473f75 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -486,7 +486,7 @@ The reason we recommend ~load-theme~ instead of the other option of
486~enable-theme~ is that the former does a kind of "reset" on the face 486~enable-theme~ is that the former does a kind of "reset" on the face
487specs. It quite literally loads (or reloads) the theme. Whereas the 487specs. It quite literally loads (or reloads) the theme. Whereas the
488~enable-theme~ function simply puts an already loaded theme to the top 488~enable-theme~ function simply puts an already loaded theme to the top
489of the list of enabled items, re-using whatever state was last loaded. 489of the list of enabled items, reusing whatever state was last loaded.
490 490
491As such, ~load-theme~ reads all customizations that may happen during 491As such, ~load-theme~ reads all customizations that may happen during
492any given Emacs session: even after the initial setup of a theme. 492any given Emacs session: even after the initial setup of a theme.
@@ -2821,7 +2821,7 @@ Reload the theme for changes to take effect.
2821#+cindex: Remapping faces 2821#+cindex: Remapping faces
2822 2822
2823There are cases where we need to change the buffer-local attributes of a 2823There are cases where we need to change the buffer-local attributes of a
2824face. This might be because we have our own minor mode that re-uses a 2824face. This might be because we have our own minor mode that reuses a
2825face for a particular purpose, such as a line selection tool that 2825face for a particular purpose, such as a line selection tool that
2826activates ~hl-line-mode~, but we wish to keep it distinct from other 2826activates ~hl-line-mode~, but we wish to keep it distinct from other
2827buffers. This is where ~face-remap-add-relative~ can be applied and may 2827buffers. This is where ~face-remap-add-relative~ can be applied and may
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 5423cf59759..31431a6ffc9 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16408,7 +16408,7 @@ The iCalendar format standard requires globally unique identifier---or
16408UID---for each entry. The iCalendar export backend creates UIDs 16408UID---for each entry. The iCalendar export backend creates UIDs
16409during export. To save a copy of the UID in the Org file set the 16409during export. To save a copy of the UID in the Org file set the
16410variable ~org-icalendar-store-UID~. The backend looks for the =ID= 16410variable ~org-icalendar-store-UID~. The backend looks for the =ID=
16411property of the entry for re-using the same UID for subsequent 16411property of the entry for reusing the same UID for subsequent
16412exports. 16412exports.
16413 16413
16414Since a single Org entry can result in multiple iCalendar 16414Since a single Org entry can result in multiple iCalendar
diff --git a/java/Makefile.in b/java/Makefile.in
index a7a9cabe135..941631b8411 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -261,8 +261,8 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES) \
261 $(AM_V_SILENT) $(libsrc)/asset-directory-tool \ 261 $(AM_V_SILENT) $(libsrc)/asset-directory-tool \
262 install_temp/assets install_temp/assets/directory-tree\ 262 install_temp/assets install_temp/assets/directory-tree\
263 $(if $(ANDROID_SDK_8_OR_EARLIER),--api-8) 263 $(if $(ANDROID_SDK_8_OR_EARLIER),--api-8)
264# If the package targets Android 2.2, move compressable and 264# If the package targets Android 2.2, move compressible and
265# non-compressable assets to separate directories. 265# non-compressible assets to separate directories.
266 $(AM_V_SILENT) \ 266 $(AM_V_SILENT) \
267 if [ -z "${ANDROID_SDK_8_OR_EARLIER}" ]; then :; else \ 267 if [ -z "${ANDROID_SDK_8_OR_EARLIER}" ]; then :; else \
268 echo "Moving large and gzipped files to separate directories...">&2;\ 268 echo "Moving large and gzipped files to separate directories...">&2;\
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 84253b2d079..80ca08fae2b 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -6276,7 +6276,7 @@
6276 * vc.el (vc-dired-mode): Now a major mode derived from dired-mode. 6276 * vc.el (vc-dired-mode): Now a major mode derived from dired-mode.
6277 (vc-directory): Take DIRNAME as an argument. Ask for it in 6277 (vc-directory): Take DIRNAME as an argument. Ask for it in
6278 the minibuffer. Don't kill pre-existing vc-dired buffers 6278 the minibuffer. Don't kill pre-existing vc-dired buffers
6279 (dired now re-uses the right one). 6279 (dired now reuses the right one).
6280 (vc-file-tree-walk): New argument DIRNAME. Updated all callers. 6280 (vc-file-tree-walk): New argument DIRNAME. Updated all callers.
6281 (vc-dired-update): New function. `g' in vc-dired-mode calls it. 6281 (vc-dired-update): New function. `g' in vc-dired-mode calls it.
6282 (vc-dired-reformat-line): Handle different ls -l formats. 6282 (vc-dired-reformat-line): Handle different ls -l formats.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 10c86571804..345687d1775 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2497,7 +2497,7 @@ ATTRLIST is a list with elements of the form :face face :foreground color."
2497 (if (not faceinfo) 2497 (if (not faceinfo)
2498 ;; No attributes to apply, so just use an existing-face. 2498 ;; No attributes to apply, so just use an existing-face.
2499 face 2499 face
2500 ;; FIXME should we be using numbered temp-faces, re-using where poss? 2500 ;; FIXME should we be using numbered temp-faces, reusing where poss?
2501 (setq temp-face 2501 (setq temp-face
2502 (make-symbol 2502 (make-symbol
2503 (concat ":caltemp" 2503 (concat ":caltemp"
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 3249f64cc6f..89c3dacf8df 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -913,7 +913,7 @@ tags.")
913 (cache :initform nil 913 (cache :initform nil
914 :type (or null semanticdb-find-result-with-nil) 914 :type (or null semanticdb-find-result-with-nil)
915 :documentation "Cache of tags. 915 :documentation "Cache of tags.
916These tags are re-used during a completion session. 916These tags are reused during a completion session.
917Sometimes these tags are cached between completion sessions.") 917Sometimes these tags are cached between completion sessions.")
918 (last-all-completions :initarg nil 918 (last-all-completions :initarg nil
919 :type semanticdb-find-result-with-nil 919 :type semanticdb-find-result-with-nil
diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1
index f1605f70f3e..d63f7aa20c6 100644
--- a/lisp/erc/ChangeLog.1
+++ b/lisp/erc/ChangeLog.1
@@ -2404,7 +2404,7 @@
2404 documentation. 2404 documentation.
2405 (erc-cmd-QUIT): Set the active buffer to be the server buffer, so 2405 (erc-cmd-QUIT): Set the active buffer to be the server buffer, so
2406 that any QUIT-related messages go there. 2406 that any QUIT-related messages go there.
2407 (erc): Try to be more clever about re-using channel buffers when 2407 (erc): Try to be more clever about reusing channel buffers when
2408 automatically re-connecting. Thanks to e1f for noticing. 2408 automatically re-connecting. Thanks to e1f for noticing.
2409 2409
24102006-01-23 Michael Olson <mwolson@gnu.org> 24102006-01-23 Michael Olson <mwolson@gnu.org>
diff --git a/lisp/external-completion.el b/lisp/external-completion.el
index b171e27014c..a9d394c61d4 100644
--- a/lisp/external-completion.el
+++ b/lisp/external-completion.el
@@ -126,7 +126,7 @@ EXPANDED-PATTERN."
126 (pcase action 126 (pcase action
127 (`metadata 127 (`metadata
128 `(metadata (category . ,category) . ,metadata)) 128 `(metadata (category . ,category) . ,metadata))
129 ;; Note: the `--tryc' `--allc' suffixes are made akward on 129 ;; Note: the `--tryc' `--allc' suffixes are made awkward on
130 ;; purpose, so it's easy to pick them apart from the jungle 130 ;; purpose, so it's easy to pick them apart from the jungle
131 ;; of combinations of "try" and "all" and "completion" that 131 ;; of combinations of "try" and "all" and "completion" that
132 ;; inhabit Emacs's completion logic. 132 ;; inhabit Emacs's completion logic.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 53f81862ddf..f8ce5630f26 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -18098,14 +18098,14 @@
180982000-11-05 Simon Josefsson <sj@extundo.com> 180982000-11-05 Simon Josefsson <sj@extundo.com>
18099 18099
18100 * mml-smime.el (mml-smime-verify): Work in original multipart 18100 * mml-smime.el (mml-smime-verify): Work in original multipart
18101 buffert. 18101 buffer.
18102 18102
18103 * mm-decode.el (mm-handle-multipart-original-buffer): New macro. 18103 * mm-decode.el (mm-handle-multipart-original-buffer): New macro.
18104 (mm-handle-multipart-ctl-parameter): Ditto. 18104 (mm-handle-multipart-ctl-parameter): Ditto.
18105 (mm-alist-to-plist): New function. 18105 (mm-alist-to-plist): New function.
18106 (mm-dissect-buffer): Store CTL parameters and copy original buffer 18106 (mm-dissect-buffer): Store CTL parameters and copy original buffer
18107 for multiparts. 18107 for multiparts.
18108 (mm-destroy-parts): Destroy multipart buffert. 18108 (mm-destroy-parts): Destroy multipart buffer.
18109 (mm-remove-part): Ditto. 18109 (mm-remove-part): Ditto.
18110 18110
18111 * mml-smime.el (mml-smime-sign): Not used. 18111 * mml-smime.el (mml-smime-sign): Not used.
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 9e9a5f97fd4..e6c2b9e05c0 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -448,7 +448,7 @@ ignored."
448 ;; ...finally, whatever may have happened to this sync 448 ;; ...finally, whatever may have happened to this sync
449 ;; request, it might have been holding up any outer 449 ;; request, it might have been holding up any outer
450 ;; "anxious" continuations. The following ensures we 450 ;; "anxious" continuations. The following ensures we
451 ;; cll them. 451 ;; call them.
452 (jsonrpc--continue connection id))))) 452 (jsonrpc--continue connection id)))))
453 (when (eq 'error (car retval)) 453 (when (eq 'error (car retval))
454 (signal 'jsonrpc-error 454 (signal 'jsonrpc-error
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index fb723fb8878..7eb66bb062b 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -781,7 +781,7 @@ If nil, the value of `ange-ftp-netrc-default-user' is used.
781If that is nil too, then your login name is used. 781If that is nil too, then your login name is used.
782 782
783Once a connection to a given host has been initiated, the user name 783Once a connection to a given host has been initiated, the user name
784and password information for that host are cached and re-used by 784and password information for that host are cached and reused by
785ange-ftp. Use \\[ange-ftp-set-user] to change the cached values, 785ange-ftp. Use \\[ange-ftp-set-user] to change the cached values,
786since setting `ange-ftp-default-user' directly does not affect 786since setting `ange-ftp-default-user' directly does not affect
787the cached information." 787the cached information."
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 74a62e00855..1cf159f19a2 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -9828,7 +9828,7 @@
9828 to explicitly kill all agenda buffers. 9828 to explicitly kill all agenda buffers.
9829 (org-agenda-run-series): Remove any old agenda markers in the 9829 (org-agenda-run-series): Remove any old agenda markers in the
9830 buffer that is going to take the new block agenda. 9830 buffer that is going to take the new block agenda.
9831 (org-prepare-agenda): Reset markers before erasing the buffer anc 9831 (org-prepare-agenda): Reset markers before erasing the buffer and
9832 running `org-agenda-mode', because after that the local variable 9832 running `org-agenda-mode', because after that the local variable
9833 `org-agenda-markers' will have gone away. 9833 `org-agenda-markers' will have gone away.
9834 (org-agenda-Quit): 9834 (org-agenda-Quit):
diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el
index 6e3142fa12b..e207a19977e 100644
--- a/lisp/org/oc-basic.el
+++ b/lisp/org/oc-basic.el
@@ -24,7 +24,7 @@
24;; The `basic' citation processor provides "activate", "follow", "export" and 24;; The `basic' citation processor provides "activate", "follow", "export" and
25;; "insert" capabilities. 25;; "insert" capabilities.
26 26
27;; "activate" capability re-uses default fontification, but provides additional 27;; "activate" capability reuses default fontification, but provides additional
28;; features on both correct and wrong keys according to the bibliography 28;; features on both correct and wrong keys according to the bibliography
29;; defined in the document. 29;; defined in the document.
30 30
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index af7269bd15a..785fb22dbc0 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -683,7 +683,7 @@ month and 365.24 days for a year)."
683(defcustom org-n-level-faces (length org-level-faces) 683(defcustom org-n-level-faces (length org-level-faces)
684 "The number of different faces to be used for headlines. 684 "The number of different faces to be used for headlines.
685Org mode defines 8 different headline faces, so this can be at most 8. 685Org mode defines 8 different headline faces, so this can be at most 8.
686If it is less than 8, the level-1 face gets re-used for level N+1 etc." 686If it is less than 8, the level-1 face gets reused for level N+1 etc."
687 :type 'integer 687 :type 'integer
688 :group 'org-faces) 688 :group 'org-faces)
689 689
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 35bbf84a0ca..6fa21be9063 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -4738,7 +4738,7 @@ matching DATUM before creating a new reference."
4738 ;; unique, e.g., there might be duplicate custom ID or 4738 ;; unique, e.g., there might be duplicate custom ID or
4739 ;; two headings with the same title in the file. 4739 ;; two headings with the same title in the file.
4740 ;; 4740 ;;
4741 ;; As a consequence, before re-using any reference to 4741 ;; As a consequence, before reusing any reference to
4742 ;; an element or object, we check that it doesn't refer 4742 ;; an element or object, we check that it doesn't refer
4743 ;; to a previous element or object. 4743 ;; to a previous element or object.
4744 (new (or (cl-some 4744 (new (or (cl-some
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 4a691e5bf67..88af92420b5 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -712,7 +712,7 @@ set already. This function sets the latter to nil
712buffer-locally, so that the auto-setup will always run. 712buffer-locally, so that the auto-setup will always run.
713 713
714This is mostly intended for MUA modes like `rmail-mode' where the 714This is mostly intended for MUA modes like `rmail-mode' where the
715same buffer is re-used for different contexts." 715same buffer is reused for different contexts."
716 (setq-local bug-reference-url-format nil) 716 (setq-local bug-reference-url-format nil)
717 (bug-reference-mode)) 717 (bug-reference-mode))
718 718
diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el
index 938f8da910d..6dedb6e4895 100644
--- a/lisp/progmodes/peg.el
+++ b/lisp/progmodes/peg.el
@@ -311,7 +311,7 @@ EXPS is a list of rules/expressions that failed.")
311 `(lambda ,args . ,body))) 311 `(lambda ,args . ,body)))
312 312
313;; Sometimes (with-peg-rules ... (peg-run (peg ...))) is too 313;; Sometimes (with-peg-rules ... (peg-run (peg ...))) is too
314;; longwinded for the task at hand, so `peg-parse' comes in handy. 314;; long-winded for the task at hand, so `peg-parse' comes in handy.
315(defmacro peg-parse (&rest pexs) 315(defmacro peg-parse (&rest pexs)
316 "Match PEXS at point. 316 "Match PEXS at point.
317PEXS is a sequence of PEG expressions, implicitly combined with `and'. 317PEXS is a sequence of PEG expressions, implicitly combined with `and'.
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 64138db9dc8..030b97c31b0 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -205,7 +205,7 @@ symbol."
205(defcustom php-ts-mode-indent-style 'psr2 205(defcustom php-ts-mode-indent-style 'psr2
206 "Style used for indentation. 206 "Style used for indentation.
207The selected style could be one of: 207The selected style could be one of:
208`PSR-2/PSR-12' - use PSR standards (PSR-2, PSR-12), thi is the default. 208`PSR-2/PSR-12' - use PSR standards (PSR-2, PSR-12), this is the default.
209`PEAR' - use coding styles preferred for PEAR code and modules. 209`PEAR' - use coding styles preferred for PEAR code and modules.
210`Drupal' - use coding styles preferred for working with Drupal projects. 210`Drupal' - use coding styles preferred for working with Drupal projects.
211`WordPress' - use coding styles preferred for working with WordPress projects. 211`WordPress' - use coding styles preferred for working with WordPress projects.
@@ -242,7 +242,7 @@ Calls REPORT-FN directly."
242 (kill-process php-ts-mode--flymake-process)) 242 (kill-process php-ts-mode--flymake-process))
243 (let ((source (current-buffer)) 243 (let ((source (current-buffer))
244 (diagnostics-pattern (eval-when-compile 244 (diagnostics-pattern (eval-when-compile
245 (rx bol (? "PHP ") ;; every dignostic line start with PHP 245 (rx bol (? "PHP ") ;; every diagnostic line start with PHP
246 (group (or "Fatal" "Parse")) ;; 1: type 246 (group (or "Fatal" "Parse")) ;; 1: type
247 " error:" (+ (syntax whitespace)) 247 " error:" (+ (syntax whitespace))
248 (group (+? nonl)) ;; 2: msg 248 (group (+? nonl)) ;; 2: msg
@@ -372,7 +372,7 @@ To set the default indent style globally, use
372 372
373`php-ts-mode' use five parsers, this function returns, for the 373`php-ts-mode' use five parsers, this function returns, for the
374current buffer, the ranges covered by each parser. 374current buffer, the ranges covered by each parser.
375Usefull for debugging." 375Useful for debugging."
376 (let ((ranges) 376 (let ((ranges)
377 (parsers (treesit-parser-list nil nil t))) 377 (parsers (treesit-parser-list nil nil t)))
378 (if (not parsers) 378 (if (not parsers)
@@ -444,7 +444,7 @@ PARENT is its parent."
444 (line-end-position)))))) 444 (line-end-position))))))
445 445
446(defun php-ts-mode--js-css-tag-bol (node _parent &rest _) 446(defun php-ts-mode--js-css-tag-bol (node _parent &rest _)
447 "Find the first non-space caracters of html tags <script> or <style>. 447 "Find the first non-space characters of html tags <script> or <style>.
448 448
449If NODE is nil return `line-beginning-position'. PARENT is ignored. 449If NODE is nil return `line-beginning-position'. PARENT is ignored.
450NODE is the node to match and PARENT is its parent." 450NODE is the node to match and PARENT is its parent."
@@ -455,7 +455,7 @@ NODE is the node to match and PARENT is its parent."
455 (re-search-backward "<script>\\|<style>" nil t)))) 455 (re-search-backward "<script>\\|<style>" nil t))))
456 456
457(defun php-ts-mode--parent-eol (_node parent &rest _) 457(defun php-ts-mode--parent-eol (_node parent &rest _)
458 "Find the last non-space caracters of the PARENT of the current NODE. 458 "Find the last non-space characters of the PARENT of the current NODE.
459 459
460NODE is the node to match and PARENT is its parent." 460NODE is the node to match and PARENT is its parent."
461 (save-excursion 461 (save-excursion
@@ -526,7 +526,7 @@ characters of the current line."
526 "Return the start of the first child of a sibling of PARENT. 526 "Return the start of the first child of a sibling of PARENT.
527 527
528If the fist sibling of PARENT and the first child of the sibling are 528If the fist sibling of PARENT and the first child of the sibling are
529on the same line return the start position of the firt child of the 529on the same line return the start position of the first child of the
530sibling. Otherwise return the start of the first sibling. 530sibling. Otherwise return the start of the first sibling.
531PARENT is NODE's parent, BOL is the beginning of non-whitespace 531PARENT is NODE's parent, BOL is the beginning of non-whitespace
532characters of the current line." 532characters of the current line."
@@ -1271,7 +1271,7 @@ Depends on `c-ts-common-comment-setup'."
1271 (require 'html-ts-mode) 1271 (require 'html-ts-mode)
1272 ;; For embed html 1272 ;; For embed html
1273 1273
1274 ;; phpdoc is a local parser, don't create a parser fot it 1274 ;; phpdoc is a local parser, don't create a parser for it
1275 (treesit-parser-create 'html) 1275 (treesit-parser-create 'html)
1276 (treesit-parser-create 'css) 1276 (treesit-parser-create 'css)
1277 (treesit-parser-create 'javascript) 1277 (treesit-parser-create 'javascript)
@@ -1517,7 +1517,7 @@ The optional TYPE can be the symbol \"port\", \"hostname\", \"document-root\" or
1517(defun run-php (&optional cmd config) 1517(defun run-php (&optional cmd config)
1518 "Run an PHP interpreter as a inferior process. 1518 "Run an PHP interpreter as a inferior process.
1519 1519
1520Argumens CMD an CONFIG, default to `php-ts-mode-php-executable' 1520Arguments CMD an CONFIG, default to `php-ts-mode-php-executable'
1521and `php-ts-mode-php-config' respectively, control which PHP interpreter is run. 1521and `php-ts-mode-php-config' respectively, control which PHP interpreter is run.
1522Prompt for CMD if `php-ts-mode-php-executable' is nil. 1522Prompt for CMD if `php-ts-mode-php-executable' is nil.
1523Optional CONFIG, if supplied, is the php.ini file to use." 1523Optional CONFIG, if supplied, is the php.ini file to use."
diff --git a/lisp/startup.el b/lisp/startup.el
index 357a4154e4c..1ffdf52ea85 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -723,7 +723,7 @@ It is the default value of the variable `top-level'."
723 (set 'native-comp-eln-load-path 723 (set 'native-comp-eln-load-path
724 (mapcar (lambda (dir) 724 (mapcar (lambda (dir)
725 ;; Call expand-file-name to remove all the 725 ;; Call expand-file-name to remove all the
726 ;; pesky ".." from the directyory names in 726 ;; pesky ".." from the directory names in
727 ;; native-comp-eln-load-path. 727 ;; native-comp-eln-load-path.
728 (expand-file-name 728 (expand-file-name
729 (decode-coding-string dir coding t))) 729 (decode-coding-string dir coding t)))
diff --git a/lisp/window.el b/lisp/window.el
index 604b9868921..0cfe7df73d5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7744,7 +7744,7 @@ to an expression containing one of these \"action\" functions:
7744 `display-buffer-in-previous-window' -- Use a window that did 7744 `display-buffer-in-previous-window' -- Use a window that did
7745 show the buffer before. 7745 show the buffer before.
7746 `display-buffer-use-some-window' -- Use some existing window. 7746 `display-buffer-use-some-window' -- Use some existing window.
7747 `display-buffer-use-least-recent-window' -- Try to avoid re-using 7747 `display-buffer-use-least-recent-window' -- Try to avoid reusing
7748 windows that have recently been switched to. 7748 windows that have recently been switched to.
7749 `display-buffer-pop-up-window' -- Pop up a new window. 7749 `display-buffer-pop-up-window' -- Pop up a new window.
7750 `display-buffer-full-frame' -- Delete other windows and use the full frame. 7750 `display-buffer-full-frame' -- Delete other windows and use the full frame.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index abea7688c87..45dc2d4e16d 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -20180,7 +20180,7 @@
20180 (CHECK_FONT_GET_OBJECT): Likewise. 20180 (CHECK_FONT_GET_OBJECT): Likewise.
20181 (XFONT_SPEC, XFONT_ENTITY, XFONT_OBJECT, XSETFONT): New macros. 20181 (XFONT_SPEC, XFONT_ENTITY, XFONT_OBJECT, XSETFONT): New macros.
20182 (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Move from font.h. 20182 (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Move from font.h.
20183 (struct font_driver): New members case_sensitive anc check. 20183 (struct font_driver): New members case_sensitive and check.
20184 Type of the member list and open changed. 20184 Type of the member list and open changed.
20185 (enable_font_backend, font_symbolic_weight, font_symbolic_slant) 20185 (enable_font_backend, font_symbolic_weight, font_symbolic_slant)
20186 (font_symbolic_width, font_find_object, font_get_spec) 20186 (font_symbolic_width, font_find_object, font_get_spec)
diff --git a/src/fns.c b/src/fns.c
index e9242e4c8ba..45567fc183a 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -6336,7 +6336,7 @@ secure_hash (Lisp_Object algorithm, Lisp_Object object, Lisp_Object start,
6336 else 6336 else
6337 error ("Invalid algorithm arg: %s", SDATA (Fsymbol_name (algorithm))); 6337 error ("Invalid algorithm arg: %s", SDATA (Fsymbol_name (algorithm)));
6338 6338
6339 /* allocate 2 x digest_size so that it can be re-used to hold the 6339 /* allocate 2 x digest_size so that it can be reused to hold the
6340 hexified value */ 6340 hexified value */
6341 digest = make_uninit_string (digest_size * 2); 6341 digest = make_uninit_string (digest_size * 2);
6342 6342
diff --git a/src/fontset.c b/src/fontset.c
index 9e914abc1ff..16d14669c89 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1877,7 +1877,7 @@ fontset_from_font (Lisp_Object font_object)
1877 1877
1878/* Update auto_fontset_alist for FONTSET. When an ASCII font of 1878/* Update auto_fontset_alist for FONTSET. When an ASCII font of
1879 FONTSET is changed, we delete an entry of FONTSET if any from 1879 FONTSET is changed, we delete an entry of FONTSET if any from
1880 auto_fontset_alist so that FONTSET is not re-used by 1880 auto_fontset_alist so that FONTSET is not reused by
1881 fontset_from_font. */ 1881 fontset_from_font. */
1882 1882
1883static void 1883static void