diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-31 08:07:41 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-31 08:07:41 -0700 |
| commit | 25cc0f2aada3e321e5f1c6d1e492a93d16da45b2 (patch) | |
| tree | 05309a9d1d74813cf25073015ef7aaf36d7a36bf /msdos | |
| parent | 4efef3db2fb1c3a20b83a67948e614d9b0c258dd (diff) | |
| parent | 788c9b69e1801dd883dbe603281571ef3c78a724 (diff) | |
| download | emacs-25cc0f2aada3e321e5f1c6d1e492a93d16da45b2.tar.gz | |
Merge from origin/emacs-25
788c9b6 ; Spelling fix
25c4a30 * lisp/recentf.el (recentf-dialog-mode-map): Remove follow-li...
0992ec3 Correct cl-flet usage (Bug#22317)
50caae3 Release MH-E manual version 8.6
602bb40 Update MH-E's documentation about HTML renderers
89018f0 Fx the we->the typo
845ee57 Restore frames into the current display by default
ee28b4c * lisp/recentf.el (recentf-open-files-item): Quick fix for (b...
01c3cd1 etc/TODO: Remove out-of-place issue
5e18486 Clarify doc string of 'file-name-sans-extension'
bffda22 Fix the MSDOS build
f907f98 * lisp/progmodes/elisp-mode.el (elisp-function-argstring): Ca...
1a2ffd0 * src/dired.c (Ffile_name_all_completions): Doc fix. (Bug#23...
f7ffc4b Fix infloop in 'number-sequence'
4ab2673 ; Spelling and punctuation fixes in comments
71c152e * lisp/emacs-lisp/find-func.el (find-function-library):
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/sed1v2.inp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 383105a3f30..d0ab8afa218 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -155,7 +155,8 @@ s/ *@LIBXPM@// /^[Aa][Mm]_/s/@AM_V@/$(V)/ /^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ /^AUTO_DEPEND *=/s/@AUTO_DEPEND@/yes/ -/^PAXCTL_if_present *=/s/=.*$/=@Rem/ +/^PAXCTL_dumped *=/s/=.*$/=/ +/^PAXCTL_notdumped *=/s/=.*$/=/ /^lisp\.mk:/,/^$/c\ lisp.mk: $(lispsource)/loadup.el\ @rm -f $@\ @@ -174,7 +175,8 @@ lisp.mk: $(lispsource)/loadup.el\ /^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/b-emacs$(EXEEXT)/ /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit -/^ *\$(PAXCTL_if_present) -zex/d +/^ *ifneq (\$(PAXCTL_notdumped),)/,/^ *endif/d +/^ *ifneq (\$(PAXCTL_dumped),)/,/^ *endif/d /^ *ln /s/ln /cp / /^ *\$(SETFATTR_if_present) -n/d /^ fi/d |