diff options
| author | Stefan Kangas | 2025-01-23 03:13:01 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2025-01-23 03:14:37 +0100 |
| commit | cda78edc7d9194181bcda1790f29cb7cf3ceb0b9 (patch) | |
| tree | 389233e91d4734810d553bc48c57d9d107afe2a9 /admin | |
| parent | ce50a1d3c18bcf0e5f51f4ed49f292f7be31010d (diff) | |
| download | emacs-cda78edc7d9194181bcda1790f29cb7cf3ceb0b9.tar.gz emacs-cda78edc7d9194181bcda1790f29cb7cf3ceb0b9.zip | |
; Fix typos
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/codespell/codespell.exclude | 13 | ||||
| -rwxr-xr-x | admin/nt/dist-build/build-dep-zips.py | 8 | ||||
| -rw-r--r-- | admin/nt/dist-build/emacs.nsi | 6 |
3 files changed, 20 insertions, 7 deletions
diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude index f4c67ae83e8..5bb85a0dac3 100644 --- a/admin/codespell/codespell.exclude +++ b/admin/codespell/codespell.exclude | |||
| @@ -1743,3 +1743,16 @@ Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph | |||
| 1743 | 2a85d81c47 Add support for gathering statistics on use-package declar... | 1743 | 2a85d81c47 Add support for gathering statistics on use-package declar... |
| 1744 | (let* ((nam (buffer-substring (match-beginning 2) (match-end 2))) | 1744 | (let* ((nam (buffer-substring (match-beginning 2) (match-end 2))) |
| 1745 | (setq nmlst (cons nam nmlst) | 1745 | (setq nmlst (cons nam nmlst) |
| 1746 | (elisp--safe-macroexpand-all): Make the warning more discrete. | ||
| 1747 | |PACK|UNPK|INDX|BLD |LEN |... | | ||
| 1748 | @key{INDX} removes an integer @var{n}, then builds a vector of | ||
| 1749 | integers from 1 to @var{n}. @kbd{INV INDX} takes three numbers | ||
| 1750 | (sref STRING INDX) returns the character in STRING at INDEX. INDEX | ||
| 1751 | ;; |PACK|UNPK|INDX|BLD |LEN |... | | ||
| 1752 | ( "INDX" (progn calc-num-prefix calc-index) "\C-u\excalc-index\r" ) | ||
| 1753 | (calc-enter-result 3 "indx" (cons 'calcFunc-index (calc-top-list-n 3))) | ||
| 1754 | (calc-enter-result 0 "indx" (list 'calcFunc-index | ||
| 1755 | (elisp--safe-macroexpand-all): Make the warning more discreet. | ||
| 1756 | dee6b36286 If use-package-verbose is t, show loading times when :afte... | ||
| 1757 | 267fc6d00c4 ruby-smie-rules: Fix misindentation of a method call afte... | ||
| 1758 | b0181dafb9e Improve documentation of 'enable-local-variables' in Emac... | ||
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py index 567e8eb2133..af3036eb8e6 100755 --- a/admin/nt/dist-build/build-dep-zips.py +++ b/admin/nt/dist-build/build-dep-zips.py | |||
| @@ -30,7 +30,7 @@ EMACS_MAJOR_VERSION= os.getenv('EMACS_MAJOR_VERSION') or "30" | |||
| 30 | # Base URI for the package sources mapped in PKG_REQ | 30 | # Base URI for the package sources mapped in PKG_REQ |
| 31 | SRC_REPO="https://repo.msys2.org/mingw/sources" | 31 | SRC_REPO="https://repo.msys2.org/mingw/sources" |
| 32 | 32 | ||
| 33 | # Map items in `dynamic-library-alist' to source pakages | 33 | # Map items in `dynamic-library-alist' to source packages |
| 34 | PKG_REQ='''mingw-w64-x86_64-giflib | 34 | PKG_REQ='''mingw-w64-x86_64-giflib |
| 35 | mingw-w64-x86_64-gnutls | 35 | mingw-w64-x86_64-gnutls |
| 36 | mingw-w64-x86_64-harfbuzz | 36 | mingw-w64-x86_64-harfbuzz |
| @@ -47,7 +47,7 @@ mingw-w64-x86_64-xpm-nox | |||
| 47 | mingw-w64-x86_64-tree-sitter | 47 | mingw-w64-x86_64-tree-sitter |
| 48 | mingw-w64-x86_64-sqlite3'''.split() | 48 | mingw-w64-x86_64-sqlite3'''.split() |
| 49 | 49 | ||
| 50 | # Emacs style path to dependancy DLLs on build system | 50 | # Emacs style path to dependency DLLs on build system |
| 51 | DLL_SRC="c:/msys64/mingw64/bin" | 51 | DLL_SRC="c:/msys64/mingw64/bin" |
| 52 | 52 | ||
| 53 | # libraries we never include | 53 | # libraries we never include |
| @@ -110,7 +110,7 @@ def gather_deps(): | |||
| 110 | print("Deps updated in", os.getcwd(), "as", zipfile) | 110 | print("Deps updated in", os.getcwd(), "as", zipfile) |
| 111 | os.chdir("../") | 111 | os.chdir("../") |
| 112 | 112 | ||
| 113 | # Return dependancies listed in Emacs | 113 | # Return dependencies listed in Emacs |
| 114 | def init_deps(): | 114 | def init_deps(): |
| 115 | return '''libXpm-nox4.dll | 115 | return '''libXpm-nox4.dll |
| 116 | libpng16-16.dll | 116 | libpng16-16.dll |
| @@ -382,7 +382,7 @@ parser.add_argument("-d", help="dry run", | |||
| 382 | parser.add_argument("-l", help="list dependencies", | 382 | parser.add_argument("-l", help="list dependencies", |
| 383 | action="store_true") | 383 | action="store_true") |
| 384 | 384 | ||
| 385 | parser.add_argument("-e", help="extract direct dependancies", | 385 | parser.add_argument("-e", help="extract direct dependencies", |
| 386 | action="store_true") | 386 | action="store_true") |
| 387 | 387 | ||
| 388 | args = parser.parse_args() | 388 | args = parser.parse_args() |
diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi index b8226d69423..4a5de4f85f9 100644 --- a/admin/nt/dist-build/emacs.nsi +++ b/admin/nt/dist-build/emacs.nsi | |||
| @@ -92,7 +92,7 @@ Section "Uninstall" | |||
| 92 | # remove All Users shortcuts only | 92 | # remove All Users shortcuts only |
| 93 | # SetShellVarContext all | 93 | # SetShellVarContext all |
| 94 | 94 | ||
| 95 | # retreive/recalculate uninstaller location | 95 | # retrieve/recalculate uninstaller location |
| 96 | StrCpy $UninstallerPath "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" | 96 | StrCpy $UninstallerPath "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" |
| 97 | 97 | ||
| 98 | # remove registry key | 98 | # remove registry key |
| @@ -101,7 +101,7 @@ Section "Uninstall" | |||
| 101 | # delete uninstaller | 101 | # delete uninstaller |
| 102 | Delete "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" | 102 | Delete "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe" |
| 103 | 103 | ||
| 104 | # retreive/reclculate startmenu shortcuts location | 104 | # retrieve/recalculate startmenu shortcuts location |
| 105 | !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder | 105 | !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder |
| 106 | StrCpy $StartMenuFolder "$SMPROGRAMS\$StartMenuFolder" | 106 | StrCpy $StartMenuFolder "$SMPROGRAMS\$StartMenuFolder" |
| 107 | 107 | ||
| @@ -120,7 +120,7 @@ Section "Uninstall" | |||
| 120 | # we're basically using GOTO, above, so we should get here.. | 120 | # we're basically using GOTO, above, so we should get here.. |
| 121 | startMenuDeleteLoopDone: | 121 | startMenuDeleteLoopDone: |
| 122 | 122 | ||
| 123 | # next we remove stuff from program-files/instalation path | 123 | # next we remove stuff from program-files/installation path |
| 124 | # start with recursive delete of the Emacs we installed | 124 | # start with recursive delete of the Emacs we installed |
| 125 | RMDir /r "$INSTDIR\emacs-${VERSION_BRANCH}" | 125 | RMDir /r "$INSTDIR\emacs-${VERSION_BRANCH}" |
| 126 | 126 | ||