diff options
| author | Po Lu | 2024-06-30 10:06:09 +0800 |
|---|---|---|
| committer | Po Lu | 2024-06-30 10:06:09 +0800 |
| commit | e2561e267fd2eb37b140a293baec79096f03290b (patch) | |
| tree | 937291ce231a708b51541bbce5f76151b344a0e0 /msdos | |
| parent | f0f883da4b410c606b46b61c80b874ead08335ea (diff) | |
| parent | 72cf9964f3c0fd63332884b8145399f1784de7f1 (diff) | |
| download | emacs-e2561e267fd2eb37b140a293baec79096f03290b.tar.gz emacs-e2561e267fd2eb37b140a293baec79096f03290b.zip | |
Merge from savannah/emacs-30
72cf9964f3c Inaccuracy in efaq.texi
fc48e9e8ed5 ; Fix typos in DOS Makefile scripts
9b8d754579f ; * etc/NEWS: Explain Nextstep.
8819e5a45d5 Fix treesit crash (bug#71681)
eaf2dc96c1f ; Fix SHR test on MS-Windows
57880f597c5 Delete redundant mention of `with-eval-after-load'
ea8ce984342 * doc/misc/efaq.texi (New in Emacs 30): Fix typos.
45a20d781a9 ; Fix typos in symbols
d95f039af43 Document security fixes in FAQ
d063af203c8 Add "New in Emacs 30" to FAQ
ca6b484162b ; * etc/NEWS: Move "Minibuffer and Completions"
35c46663e49 ; * etc/NEWS: Move item to "Lisp Changes".
0515b38d289 ; * etc/NEWS: Move keyboard macro items closer together.
22af3a71039 ; * etc/NEWS: More copy-edits.
000ef8876ae ; * etc/NEWS: Move items to "Incompatible Lisp Changes".
4088dc8e4ce ; * etc/NEWS: Rearrange "Incompatible Lisp Changes".
179800f36bb ; * lisp/epg.el (epg--start): Add commentary about encoding.
73898f0214c Fix non-ASCII filename operatiion on EasyPG (bug#71500)
a65b6aac6b5 Silence warning with global minor mode :predicate
f5f7343ac41 ; * etc/NEWS: Move an item to "Startup Changes"
c95066bf188 ; * etc/NEWS: Move some Lisp items to better place.
bf7db88ce1f ; * etc/NEWS: Rearrange "Editing Changes in Emacs 30.1"
000424eb9eb ; * etc/NEWS: Make touch screen support more prominent.
5b5671587fb ; * etc/NEWS: Rearrange "Changes in Emacs 30.1".
31124abdefe ; * lisp/thingatpt.el (sexp-at-point): Doc fix (bug#71777).
44f269d6e60 Fix: make 'xwidget-webkit-scroll-backward' scroll backwards
358085997c6 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
736b7cad406 Add jsdoc support to php-ts-mode in <script> element
5f3d964e397 Update to Transient v0.7.2-4-gf75bc48d
# Conflicts:
# etc/NEWS
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/sedlibmk.inp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index b4681d2ae07..624983798c4 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp | |||
| @@ -288,7 +288,7 @@ s/@PACKAGE@/emacs/ | |||
| 288 | /^MKDIR_P *=/s/@MKDIR_P@/echo/ | 288 | /^MKDIR_P *=/s/@MKDIR_P@/echo/ |
| 289 | /^NEXT_AS_FIRST_DIRECTIVE_DIRENT_H *=/s/@[^@\n]*@/<dirent.h>/ | 289 | /^NEXT_AS_FIRST_DIRECTIVE_DIRENT_H *=/s/@[^@\n]*@/<dirent.h>/ |
| 290 | /^NEXT_AS_FIRST_DIRECTIVE_ERRNO_H *=/s/@[^@\n]*@// | 290 | /^NEXT_AS_FIRST_DIRECTIVE_ERRNO_H *=/s/@[^@\n]*@// |
| 291 | /^NEXT_AS_FIRST_DIRECTIVE_ENDIAN_H *=/s/@[^@\n]*@/<machine/endian.h>/ | 291 | /^NEXT_AS_FIRST_DIRECTIVE_ENDIAN_H *=/s|@[^@\n]*@|<machine/endian.h>| |
| 292 | /^NEXT_AS_FIRST_DIRECTIVE_FCNTL_H *=/s/@[^@\n]*@/<fcntl.h>/ | 292 | /^NEXT_AS_FIRST_DIRECTIVE_FCNTL_H *=/s/@[^@\n]*@/<fcntl.h>/ |
| 293 | /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/ | 293 | /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/ |
| 294 | /^NEXT_AS_FIRST_DIRECTIVE_LIMITS_H *=/s/@[^@\n]*@/<limits.h>/ | 294 | /^NEXT_AS_FIRST_DIRECTIVE_LIMITS_H *=/s/@[^@\n]*@/<limits.h>/ |
| @@ -307,7 +307,7 @@ s/@PACKAGE@/emacs/ | |||
| 307 | /^NEXT_DIRENT_H *=/s/@[^@\n]*@/<dirent.h>/ | 307 | /^NEXT_DIRENT_H *=/s/@[^@\n]*@/<dirent.h>/ |
| 308 | /^NEXT_DIRENT_H *=/s/@[^@\n]*@/<dirent.h>/ | 308 | /^NEXT_DIRENT_H *=/s/@[^@\n]*@/<dirent.h>/ |
| 309 | /^NEXT_ERRNO_H *=/s/@[^@\n]*@// | 309 | /^NEXT_ERRNO_H *=/s/@[^@\n]*@// |
| 310 | /^NEXT_ENDIAN_H *=/s/@[^@\n]*@/<machine/endian.h>/ | 310 | /^NEXT_ENDIAN_H *=/s|@[^@\n]*@|<machine/endian.h>| |
| 311 | /^NEXT_FCNTL_H *=/s/@[^@\n]*@/<fcntl.h>/ | 311 | /^NEXT_FCNTL_H *=/s/@[^@\n]*@/<fcntl.h>/ |
| 312 | /^NEXT_FLOAT_H *=/s/@[^@\n]*@// | 312 | /^NEXT_FLOAT_H *=/s/@[^@\n]*@// |
| 313 | /^NEXT_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/ | 313 | /^NEXT_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/ |