Commit ccdaf04c authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix the MSDOS build

* config.bat:
* msdos/sedlisp.inp:
* msdos/sedlibmk.inp:
* msdos/sedleim.inp:
* msdos/sedadmin.inp:
* msdos/sed6.inp:
* msdos/sed3v2.inp:
* msdos/sed2v2.inp:
* msdos/sed1v2.inp: Adapt to Emacs 25.

* src/process.c (remove_slash_colon): Move out of "#ifdef
subprocesses" block, as it its called unconditionally.  Move
ADD_SUBFEATURE calls into "#ifdef subprocesses" block, as they
reference variables only defined in that block.
* src/msdos.h: Provide prototypes for IT_set_frame_parameters,
faccessat, msdos_fatal_signal, syms_of_msdos, pthread_sigmask,
dos_keysns, dos_keyread, run_msdos_command, and
syms_of_win16select, to avoid compiler warnings.
* src/msdos.c (SYS_ENVIRON): Define to either '_environ' or
'environ', depending on the DJGPP version.
Remove declarations of externally-visible Lisp objects, like
Qbackground_color and Qreverse.
(run_msdos_command): First argument is not signed, not unsigned.
Use SYS_ENVIRON.
(sys_select): Use 'timespec_cmp' instead of 'timespec_sign', as
the latter doesn't work when 'time_t' is an unsigned data type.
This caused idle timers to behave incorrectly: they only fired
after a keyboard input event.
* src/frame.c (adjust_frame_size) [MSDOS]: Account for
FRAME_TOP_MARGIN that isn't counted in the frame's number of
lines, but dos_set_window_size needs it to be added.
* src/lread.c (INFINITY, NAN) [DJGPP < 2.05]: Provide definitions.
* src/fns.c (sort_vector_copy) [__GNUC__ < 4]: Provide a prototype
that works around compilation errors with older GCC versions.
* src/w16select.c: Don't declare QCLIPBOARD and QPRIMARY as Lisp
Objects.
* src/filelock.c [MSDOS]: Ifdef away most of the code.  Provide
no-op implementations for 'lock_file' and 'unlock_file'.
(Ffile_locked_p) [MSDOS]: Always return nil.  This avoids multiple
ifdefs in all users of filelock.c functionality.
* src/conf_post.h (EOVERFLOW, SIZE_MAX) [DJGPP < 2.04]: Define.
* src/emacs.c [MSDOS]: Include dosfns.h, to avoid compiler
warnings.
* src/dosfns.h: Provide prototypes for dos_cleanup,
syms_of_dosfns, and init_dosfns.
* src/deps.mk (atimer.o): Depend on msdos.h.
(emacs.o): Depend on dosfns.h.
* src/atimer.c [MSDOS]: Include msdos.h, to avoid compiler
warnings.

* lisp/window.el (window--adjust-process-windows): Skip the body
if 'process-list' is not available.  This avoids failure to start
up on MS-DOS.
* lisp/vc/diff.el (diff-no-select): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
* lisp/textmodes/ispell.el (ispell-async-processp): Replace
'start-process' with 'make-process' in a comment.
* lisp/term/internal.el (IT-unicode-translations): Modify and add
a few translations to display Info files with Unicode markup.  Fix
an ancient off-by-one mismatch error with Unicode codepoints.
* lisp/progmodes/compile.el (compilation-start): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/man.el (Man-build-man-command, Man-getpage-in-background):
Test 'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/international/mule-cmds.el (set-coding-system-map): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/eshell/esh-cmd.el (eshell-do-pipelines-synchronously): Doc
fix.
(eshell-execute-pipeline): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
parent ffe701cb
...@@ -174,7 +174,7 @@ junk ...@@ -174,7 +174,7 @@ junk
If ErrorLevel 1 Goto xmlDone If ErrorLevel 1 Goto xmlDone
Echo Configuring with libxml2 ... Echo Configuring with libxml2 ...
sed -e "/#undef HAVE_LIBXML2/s/^.*$/#define HAVE_LIBXML2 1/" <config.h2 >config.h3 sed -e "/#undef HAVE_LIBXML2/s/^.*$/#define HAVE_LIBXML2 1/" <config.h2 >config.h3
mv config.h3 config.h2 sed -e "/#define EMACS_CONFIG_FEATURES/s/^.*$/#define EMACS_CONFIG_FEATURES \"LIBXML2\"/" <config.h3 >config.h2
set libxml=1 set libxml=1
:xmlDone :xmlDone
rm -f junk.c junk junk.exe rm -f junk.c junk junk.exe
...@@ -194,7 +194,7 @@ if exist dir.h ren dir.h vmsdir.h ...@@ -194,7 +194,7 @@ if exist dir.h ren dir.h vmsdir.h
rem Create "makefile" from "makefile.in". rem Create "makefile" from "makefile.in".
rm -f Makefile makefile.tmp rm -f Makefile makefile.tmp
copy Makefile.in+lisp.mk+deps.mk makefile.tmp copy Makefile.in+deps.mk makefile.tmp
sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile
rm -f makefile.tmp rm -f makefile.tmp
...@@ -227,6 +227,10 @@ rem ---------------------------------------------------------------------- ...@@ -227,6 +227,10 @@ rem ----------------------------------------------------------------------
Echo Configuring the library source directory... Echo Configuring the library source directory...
cd lib-src cd lib-src
sed -f ../msdos/sed3v2.inp <Makefile.in >Makefile sed -f ../msdos/sed3v2.inp <Makefile.in >Makefile
mv Makefile makefile.tmp
sed -n -e "/^AC_INIT/s/[^,]*, \([^,]*\).*/@set emver=\1/p" ../configure.ac > emver.bat
call emver.bat
sed -e "s/@version@/%emver%/g" <makefile.tmp >Makefile
if "%X11%" == "" goto libsrc2a if "%X11%" == "" goto libsrc2a
mv Makefile makefile.tmp mv Makefile makefile.tmp
sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile
...@@ -252,16 +256,23 @@ cd .. ...@@ -252,16 +256,23 @@ cd ..
rem ---------------------------------------------------------------------- rem ----------------------------------------------------------------------
Echo Configuring the doc directory, expect one "File not found" message... Echo Configuring the doc directory, expect one "File not found" message...
cd doc cd doc
Rem Rename files like djtar on plain DOS filesystem would.
If Exist emacs\emacsver.texi.in update emacs/emacsver.texi.in emacs/emacsver.in
If Exist man\emacs.1.in update man/emacs.1.in man/emacs.in
If Exist ..\etc\refcards\emacsver.tex.in update ../etc/refcards/emacsver.tex.in ../etc/refcards/emacsver.in
Rem The two variants for lispintro below is for when the shell Rem The two variants for lispintro below is for when the shell
Rem supports long file names but DJGPP does not Rem supports long file names but DJGPP does not
for %%d in (emacs lispref lispintro lispintr misc) do sed -f ../msdos/sed6.inp < %%d\Makefile.in > %%d\Makefile for %%d in (emacs lispref lispintro lispintr misc) do sed -e "s/@version@/%emver%/g" -f ../msdos/sed6.inp < %%d\Makefile.in > %%d\Makefile
Rem produce emacs.1 from emacs.in
If Exist man\emacs.1 goto manOk
sed -e "s/@version@/%emver%/g" -e "s/@PACKAGE_BUGREPORT@/bug-gnu-emacs@gnu.org/g" < man\emacs.in > man\emacs.1
:manOk
cd .. cd ..
rem ---------------------------------------------------------------------- rem ----------------------------------------------------------------------
Echo Configuring the lib directory... Echo Configuring the lib directory...
If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/cxxdefs.h If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/cxxdefs.h
cd lib cd lib
Rem Rename files like djtar on plain DOS filesystem would. Rem Rename files like djtar on plain DOS filesystem would.
If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/cxxdefs.h
If Exist alloca.in.h update alloca.in.h alloca.in-h If Exist alloca.in.h update alloca.in.h alloca.in-h
If Exist byteswap.in.h update byteswap.in.h byteswap.in-h If Exist byteswap.in.h update byteswap.in.h byteswap.in-h
If Exist dirent.in.h update dirent.in.h dirent.in-h If Exist dirent.in.h update dirent.in.h dirent.in-h
...@@ -286,6 +297,7 @@ If Exist sys_types.in.h update sys_types.in.h sys_types.in-h ...@@ -286,6 +297,7 @@ If Exist sys_types.in.h update sys_types.in.h sys_types.in-h
If Exist sys_time.in.h update sys_time.in.h sys_time.in-h If Exist sys_time.in.h update sys_time.in.h sys_time.in-h
If Exist time.in.h update time.in.h time.in-h If Exist time.in.h update time.in.h time.in-h
If Exist unistd.in.h update unistd.in.h unistd.in-h If Exist unistd.in.h update unistd.in.h unistd.in-h
Rem Only repository has the msdos/autogen directory
If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
If Exist ..\msdos\autogen\Makefile.in sed -f ../msdos/sedlibcf.inp < ..\msdos\autogen\Makefile.in > makefile.tmp If Exist ..\msdos\autogen\Makefile.in sed -f ../msdos/sedlibcf.inp < ..\msdos\autogen\Makefile.in > makefile.tmp
sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
...@@ -311,6 +323,12 @@ If Not Exist admin\unidata goto noadmin ...@@ -311,6 +323,12 @@ If Not Exist admin\unidata goto noadmin
Echo Configuring the admin/unidata directory... Echo Configuring the admin/unidata directory...
cd admin\unidata cd admin\unidata
sed -f ../../msdos/sedadmin.inp < Makefile.in > Makefile sed -f ../../msdos/sedadmin.inp < Makefile.in > Makefile
Echo Configuring the admin/charsets directory...
cd ..\charsets
sed -f ../../msdos/sedadmin.inp < Makefile.in > Makefile
Echo Configuring the admin/grammars directory...
cd ..\grammars
sed -f ../../msdos/sedadmin.inp < Makefile.in > Makefile
cd ..\.. cd ..\..
:noadmin :noadmin
rem ---------------------------------------------------------------------- rem ----------------------------------------------------------------------
...@@ -345,3 +363,4 @@ set nodebug= ...@@ -345,3 +363,4 @@ set nodebug=
set djgpp_ver= set djgpp_ver=
set sys_malloc= set sys_malloc=
set libxml= set libxml=
set emver=
...@@ -800,7 +800,7 @@ This macro calls itself recursively, with NOTFIRST non-nil." ...@@ -800,7 +800,7 @@ This macro calls itself recursively, with NOTFIRST non-nil."
(defmacro eshell-do-pipelines-synchronously (pipeline) (defmacro eshell-do-pipelines-synchronously (pipeline)
"Execute the commands in PIPELINE in sequence synchronously. "Execute the commands in PIPELINE in sequence synchronously.
Output of each command is passed as input to the next one in the pipeline. Output of each command is passed as input to the next one in the pipeline.
This is used on systems where `start-process' is not supported." This is used on systems where async subprocesses are not supported."
(when (setq pipeline (cadr pipeline)) (when (setq pipeline (cadr pipeline))
`(progn `(progn
,(when (cdr pipeline) ,(when (cdr pipeline)
...@@ -838,7 +838,7 @@ This is used on systems where `start-process' is not supported." ...@@ -838,7 +838,7 @@ This is used on systems where `start-process' is not supported."
"Execute the commands in PIPELINE, connecting each to one another." "Execute the commands in PIPELINE, connecting each to one another."
`(let ((eshell-in-pipeline-p t) tailproc) `(let ((eshell-in-pipeline-p t) tailproc)
(progn (progn
,(if (fboundp 'start-process) ,(if (fboundp 'make-process)
`(eshell-do-pipelines ,pipeline) `(eshell-do-pipelines ,pipeline)
`(let ((tail-handles (eshell-create-handles `(let ((tail-handles (eshell-create-handles
(car (aref eshell-current-handles (car (aref eshell-current-handles
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
(let ((map (make-sparse-keymap "Set Coding System"))) (let ((map (make-sparse-keymap "Set Coding System")))
(bindings--define-key map [set-buffer-process-coding-system] (bindings--define-key map [set-buffer-process-coding-system]
'(menu-item "For I/O with Subprocess" set-buffer-process-coding-system '(menu-item "For I/O with Subprocess" set-buffer-process-coding-system
:visible (fboundp 'start-process) :visible (fboundp 'make-process)
:enable (get-buffer-process (current-buffer)) :enable (get-buffer-process (current-buffer))
:help "How to en/decode I/O from/to subprocess connected to this buffer")) :help "How to en/decode I/O from/to subprocess connected to this buffer"))
(bindings--define-key map [set-next-selection-coding-system] (bindings--define-key map [set-next-selection-coding-system]
......
...@@ -619,7 +619,7 @@ This is necessary if one wants to dump man.el with Emacs." ...@@ -619,7 +619,7 @@ This is necessary if one wants to dump man.el with Emacs."
;; `call-process' below sends it to /dev/null, ;; `call-process' below sends it to /dev/null,
;; so we don't need `2>' even with DOS shells ;; so we don't need `2>' even with DOS shells
;; which do support stderr redirection. ;; which do support stderr redirection.
((not (fboundp 'start-process)) " %s") ((not (fboundp 'make-process)) " %s")
((concat " %s 2>" null-device))))) ((concat " %s 2>" null-device)))))
(flist Man-filter-list)) (flist Man-filter-list))
(while (and flist (car flist)) (while (and flist (car flist))
...@@ -1080,7 +1080,7 @@ Return the buffer in which the manpage will appear." ...@@ -1080,7 +1080,7 @@ Return the buffer in which the manpage will appear."
"[cleaning...]") "[cleaning...]")
'face 'mode-line-emphasis))) 'face 'mode-line-emphasis)))
(Man-start-calling (Man-start-calling
(if (fboundp 'start-process) (if (fboundp 'make-process)
(let ((proc (start-process (let ((proc (start-process
manual-program buffer manual-program buffer
(if (memq system-type '(cygwin windows-nt)) (if (memq system-type '(cygwin windows-nt))
......
...@@ -1736,7 +1736,7 @@ Returns the compilation buffer created." ...@@ -1736,7 +1736,7 @@ Returns the compilation buffer created."
(funcall compilation-process-setup-function)) (funcall compilation-process-setup-function))
(and outwin (compilation-set-window-height outwin)) (and outwin (compilation-set-window-height outwin))
;; Start the compilation. ;; Start the compilation.
(if (fboundp 'start-process) (if (fboundp 'make-process)
(let ((proc (let ((proc
(if (eq mode t) (if (eq mode t)
;; comint uses `start-file-process'. ;; comint uses `start-file-process'.
......
...@@ -233,13 +233,13 @@ ...@@ -233,13 +233,13 @@
"U*!" "U*'" "R*;" "!:" ":'" "!*" nil nil nil "w*j" "U*!" "U*'" "R*;" "!:" ":'" "!*" nil nil nil "w*j"
nil nil "w*?" nil "O*!" "O*'" "W*!" "W*'" "W*J" "/*" nil nil "w*?" nil "O*!" "O*'" "W*!" "W*'" "W*J" "/*"
";;" nil nil nil "1N" "1M" "3M" "4M" "6M" nil ; Gen Punct ";;" nil nil nil "1N" "1M" "3M" "4M" "6M" nil ; Gen Punct
nil "1T" "1H" nil nil nil "LRM" "RLM" "-1" nil nil "1T" "1H" nil nil nil "LRM" "RLM" "-" "-"
nil "--" "---" "===" "!2" "=2" "6`" "'9" ".9" "9'" "-" "--" "---" "===" "!2" "=2" "'" "'" ".9" "9'"
"``" "''" ":9" "9``" "/-" "/=" "sb" "3b" nil ".." "\"" "\"" ":9" "9``" "/-" "/=" "sb" "3b" nil ".."
"..." ".-" "LSep" "PSep" "LR[" "RL[" "PDF" "LRO" "RLO" 255 "..." ".-" "LSep" "PSep" "LR[" "RL[" "PDF" "LRO" "RLO" 255
"%o" "%oo" "'" "''" "\"'" "`" "``" "```" ".^" "<," "%o" "%oo" "'" "''" "\"'" "`" "``" "```" ".^" "<,"
",>" ":X" "!!" "?!" "'-" nil nil nil nil "-b" ",>" ":X" "!!" "?!" "'-" nil nil nil nil "-b"
"/f" nil nil nil nil nil nil nil nil nil "/f" nil nil "??" "?!" "!?" nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
...@@ -265,17 +265,17 @@ ...@@ -265,17 +265,17 @@
"oK" "AO" nil nil "Est" nil nil nil nil nil "oK" "AO" nil nil "Est" nil nil nil nil nil
nil "Aleph" "Bet" "Gimel" "Dalet" "=i=" nil nil nil nil nil "Aleph" "Bet" "Gimel" "Dalet" "=i=" nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil "1/7" "1/9"
nil "1/3" "2/3" "1/5" "2/5" "3/5" "4/5" "1/6" "5/6" "1/8" "1/10" "1/3" "2/3" "1/5" "2/5" "3/5" "4/5" "1/6" "5/6" "1/8"
"3/8" "5/8" "7/8" "1/" ".I" "II" "III" "IV" ".V" "VI" "3/8" "5/8" "7/8" "1/" ".I" "II" "III" "IV" ".V" "VI"
"VII" "VIII" "IX" "X" "XI" "XII" ".L" ".C" ".D" ".M" "VII" "VIII" "IX" "X" "XI" "XII" ".L" ".C" ".D" ".M"
".i" "ii" "iii" "iv" ".v" "vi" "vii" "viii" "ix" ".x" ".i" "ii" "iii" "iv" ".v" "vi" "vii" "viii" "ix" ".x"
"xi" ".l" ".c" ".d" ".m" "CD" "DD" "CoD" "CI" nil "xi" "xii" ".l" ".c" ".d" ".m" "CD" "DD" "CoD" "CI"
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil "<-" "|^" "->" "|v" "<->" "v|^" "^\\" "/^" "\\v" nil nil "<-" "|^" "->" "|v" "<->" "v|^" "^\\" "/^"
"v/" "<-/" "/->" "<~" "~>" "<<-" "|^^" "->>" "|vv" "<-<" "\\v" "v/" "<-/" "/->" "<~" "~>" "<<-" "|^^" "->>" "|vv"
">->" "<-|" "_|^" "|->" "-|v" "_v|^" "<-?" "?->" "<-o" "o->" "<-<" ">->" "<-|" "_|^" "|->" "-|v" "_v|^" "<-?" "?->" "<-o"
"<~>" "<-/>" nil nil nil nil nil nil nil nil "o->" "<~>" "<-/>" nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil "<=/" "<=/>" "/=>" "<=" "||^" "=>" "||v" nil nil nil "<=/" "<=/>" "/=>" "<=" "||^" "=>" "||v"
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
"~<'" "`>~" "/<'" "/`>" "(C" ")C" "/(C" "/)C" "(_" ")_" "~<'" "`>~" "/<'" "/`>" "(C" ")C" "/(C" "/)C" "(_" ")_"
"/(_" "/)_" nil nil nil nil nil nil nil nil "/(_" "/)_" nil nil nil nil nil nil nil nil
nil nil nil "0+" "0-" "0x" "0/" "0." "0o" "0*" nil nil nil "0+" "0-" "0x" "0/" "0." "0o" "0*"
"0=" "0_" nil nil nil nil "|T" "T|" "-T" "_T" "0=" "0_" nil nil nil nil "|-" "-|" "-T" "_T"
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil "-,-" nil nil nil nil nil nil nil nil nil "-,-"
nil "XOR" "NAND" "NOR" nil nil nil nil nil nil nil "XOR" "NAND" "NOR" nil nil nil nil nil nil
...@@ -357,8 +357,10 @@ ...@@ -357,8 +357,10 @@
"M-o" "N-o" "O-o" "P-o" "Q-o" "R-o" "S-o" "T-o" "U-o" "V-o" "M-o" "N-o" "O-o" "P-o" "Q-o" "R-o" "S-o" "T-o" "U-o" "V-o"
"W-o" "X-o" "Y-o" "Z-o" "a-o" "b-o" "c-o" "d-o" "e-o" "f-o" "W-o" "X-o" "Y-o" "Z-o" "a-o" "b-o" "c-o" "d-o" "e-o" "f-o"
"g-o" "h-o" "i-o" "j-o" "k-o" "l-o" "m-o" "n-o" "o-o" "p-o" "g-o" "h-o" "i-o" "j-o" "k-o" "l-o" "m-o" "n-o" "o-o" "p-o"
"q-o" "r-o" "s-o" "t-o" "u-o" "v-o" "w-o" "x-o" "y-o" "z-o" "q-o" "r-o" "s-o" "t-o" "u-o" "v-o" "w-o" "x-o" "y-o" "z-o" "0-o" ]
"0-o" ] )
(9733 9734
["-!-" "-*-"]
) )
) )
......
...@@ -1000,7 +1000,7 @@ and added as a submenu of the \"Edit\" menu.") ...@@ -1000,7 +1000,7 @@ and added as a submenu of the \"Edit\" menu.")
(defvar ispell-async-processp (and (fboundp 'delete-process) (defvar ispell-async-processp (and (fboundp 'delete-process)
(fboundp 'process-send-string) (fboundp 'process-send-string)
(fboundp 'accept-process-output) (fboundp 'accept-process-output)
;;(fboundp 'start-process) ;;(fboundp 'make-process)
;;(fboundp 'set-process-filter) ;;(fboundp 'set-process-filter)
;;(fboundp 'process-kill-without-query) ;;(fboundp 'process-kill-without-query)
) )
......
...@@ -167,7 +167,7 @@ Possible values are: ...@@ -167,7 +167,7 @@ Possible values are:
(setq default-directory thisdir) (setq default-directory thisdir)
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(insert command "\n")) (insert command "\n"))
(if (and (not no-async) (fboundp 'start-process)) (if (and (not no-async) (fboundp 'make-process))
(let ((proc (start-process "Diff" buf shell-file-name (let ((proc (start-process "Diff" buf shell-file-name
shell-command-switch command))) shell-command-switch command)))
(set-process-filter proc 'diff-process-filter) (set-process-filter proc 'diff-process-filter)
......
...@@ -8543,16 +8543,17 @@ displaying that processes's buffer." ...@@ -8543,16 +8543,17 @@ displaying that processes's buffer."
(defun window--adjust-process-windows () (defun window--adjust-process-windows ()
"Update process window sizes to match the current window configuration." "Update process window sizes to match the current window configuration."
(dolist (procwin (window--process-window-list)) (when (fboundp 'process-list)
(let ((process (car procwin))) (dolist (procwin (window--process-window-list))
(with-demoted-errors "Error adjusting window size: %S" (let ((process (car procwin)))
(with-current-buffer (process-buffer process) (with-demoted-errors "Error adjusting window size: %S"
(let ((size (funcall (with-current-buffer (process-buffer process)
(or (process-get process 'adjust-window-size-function) (let ((size (funcall
window-adjust-process-window-size-function) (or (process-get process 'adjust-window-size-function)
process (cdr procwin)))) window-adjust-process-window-size-function)
(when size process (cdr procwin))))
(set-process-window-size process (cdr size) (car size))))))))) (when size
(set-process-window-size process (cdr size) (car size))))))))))
(add-hook 'window-configuration-change-hook 'window--adjust-process-windows) (add-hook 'window-configuration-change-hook 'window--adjust-process-windows)
......
...@@ -15,32 +15,24 @@ ...@@ -15,32 +15,24 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
s/^#.*//
s/^[ \f\t][ \f\t]*$// s/^[ \f\t][ \f\t]*$//
s/^ / / s/^ / /
s/\.h\.in/.h-in/ s/\.h\.in/.h-in/
/^MAKE *=/s/^/# /
/^SHELL *=/s/^/# / /^SHELL *=/s/^/# /
/^srcdir *=/s/@[^@\n]*@/./ /^srcdir *=/s/@[^@\n]*@/./
/^abs_builddir *=/s|@abs_builddir@|../src| /^top_srcdir *=/s/@[^@\n]*@/../
/^VPATH *=/s/@[^@\n]*@/./ /^CC *=/s/@[^@\n]*@/gcc -std=gnu99/
/^CC *=/s/@[^@\n]*@/gcc/
/^CPP *=/s/@[^@\n]*@/gcc -e/
/^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/
/^ALL_CFLAGS *=/s/@[^@\n]*@//g /^ALL_CFLAGS *=/s/@[^@\n]*@//g
/^ALL_CFLAGS *=/s/ -I\.//g /^ALL_CFLAGS *=/s/ -I\.//g
/^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos| /^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos|
/^LDFLAGS *=/s/@[^@\n]*@// /^LDFLAGS *=/s/@[^@\n]*@//
/^LD_FIRSTFLAG *=/s/@[^@\n]*@//
/^LIBS *=/s/@[^@\n]*@//
/^LIBES *=/,/^ *$/ {
s/@[^@\n]*@//g
}
/^LIBOBJS *=/s/@[^@\n]*@// /^LIBOBJS *=/s/@[^@\n]*@//
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
/^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@//
/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
/^PNG_CFLAGS *=/s/@PNG_CFLAGS@//
/^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
...@@ -64,6 +56,7 @@ s/ *@LIBPNG@// ...@@ -64,6 +56,7 @@ s/ *@LIBPNG@//
s/ *@LIBGIF@// s/ *@LIBGIF@//
s/ *@LIBXPM@// s/ *@LIBXPM@//
/^XFT_LIBS *=/s/@XFT_LIBS@// /^XFT_LIBS *=/s/@XFT_LIBS@//
/^XCB_LIBS *=/s/@XCB_LIBS@//
/^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@// /^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@//
/^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@// /^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@//
/^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@// /^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@//
...@@ -78,7 +71,8 @@ s/ *@LIBXPM@// ...@@ -78,7 +71,8 @@ s/ *@LIBXPM@//
/^NOTIFY_OBJ *=/s/@NOTIFY_OBJ@// /^NOTIFY_OBJ *=/s/@NOTIFY_OBJ@//
/^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@// /^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@//
/^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@// /^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@//
/^GFILENOTIFY_LIBS *=/s/@GFILENOTIFY_LIBS@// /^NOTIFY_LIBS *=/s/@NOTIFY_LIBS@//
/^NOTIFY_CFLAGS *=/s/@NOTIFY_CFLAGS@//
/^GTK_OBJ *=/s/@GTK_OBJ@// /^GTK_OBJ *=/s/@GTK_OBJ@//
/^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@//
/^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/ /^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/
...@@ -92,7 +86,7 @@ s/ *@LIBXPM@// ...@@ -92,7 +86,7 @@ s/ *@LIBXPM@//
/^XGSELOBJ *=/s/@XGSELOBJ@// /^XGSELOBJ *=/s/@XGSELOBJ@//
/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@//
/^LIBSOUND *=/s/@LIBSOUND@// /^LIBSOUND *=/s/@LIBSOUND@//
/^LIBS_GNUSTEP *=/s/@LIBS_GNUSTEP@// /^LIBS_GNUSTEP *=/s/=.*$/=/
/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
/^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_LIBS *=/s/@RSVG_LIBS@//
/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
...@@ -101,15 +95,23 @@ s/ *@LIBXPM@// ...@@ -101,15 +95,23 @@ s/ *@LIBXPM@//
/^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@// /^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@//
/^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@// /^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@//
/^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
/^XWIDGETS_OBJ *=/s/@XWIDGETS_OBJ@//
/^WEBKIT_LIBS *=/s/@WEBKIT_LIBS@//
/^WEBKIT_CFLAGS *=/s/@WEBKIT_CFLAGS@//
/^CAIRO_LIBS *=/s/@CAIRO_LIBS@//
/^CAIRO_CFLAGS *=/s/@CAIRO_CFLAGS@//
/^XFIXES_LIBS *=/s/@XFIXES_LIBS@//
/^XFIXES_CFLAGS *=/s/@XFIXES_CFLAGS@//
/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
/^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@// /^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@//
/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/
/^NS_OBJ *=/s/@NS_OBJ@// /^NS_OBJ *=/s/@NS_OBJ@//
/^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@//
/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^GNU_OBJC_CFLAGS*=/s/=.*$/=/
/^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBRESOLV *=/s/@LIBRESOLV@//
/^LIBMODULES *=/s/@LIBMODULES@//
/^MODULES_OBJ *=/s/@MODULES_OBJ@//
/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@//
/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g
/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g
/^LIB_EXECINFO *=/s/@[^@\n]*@//g /^LIB_EXECINFO *=/s/@[^@\n]*@//g
...@@ -145,65 +147,59 @@ s/ *@LIBXPM@// ...@@ -145,65 +147,59 @@ s/ *@LIBXPM@//
/^W32_LIBS *=/s/@W32_LIBS@// /^W32_LIBS *=/s/@W32_LIBS@//
/^version *=/s/@[^@\n]*@// /^version *=/s/@[^@\n]*@//
/^EMACSRES *=/s/@EMACSRES@// /^EMACSRES *=/s/@EMACSRES@//
/^EMACS_MANIFEST *=/s/@EMACS_MANIFEST@//
/^W32_RES_LINK *=/s/@W32_RES_LINK@// /^W32_RES_LINK *=/s/@W32_RES_LINK@//
/^CM_OBJ *=/s/@CM_OBJ@/cm.o/ /^CM_OBJ *=/s/@CM_OBJ@/cm.o/
/^@SET_MAKE@$/s/@SET_MAKE@// /^@SET_MAKE@$/s/@SET_MAKE@//
/^TEMACS_POST_LINK *=/s/@TEMACS_POST_LINK@/stubedit temacs.exe minstack=1024k/
/^ADDSECTION *=/s/@ADDSECTION@// /^ADDSECTION *=/s/@ADDSECTION@//
/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! /^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/
/^ [ ]*\$(libsrc)\/make-docfile.*>.*gl.tmp/s!make-docfile!make-docfile -o gl.tmp! /^[Aa][Mm]_/s/@AM_V@/$(V)/
/^.\$(libsrc)\/make-doc/s!>.*$!! /^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/
/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src! /^AUTO_DEPEND *=/s/@AUTO_DEPEND@/yes/
/^[ ]*$/d /^PAXCTL_if_present *=/s/=.*$/=@Rem/
/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/temacs$(EXEEXT) $(BOOTSTRAPEMACS)/ /^lisp\.mk:/,/^$/c\
lisp.mk: $(lispsource)/loadup.el\
@rm -f $@\
${AM_V_GEN}printf 'shortlisp = \\n' > $@\
${AM_V_GEN}sed -n 's/^[ \t]*(load "\([^"]*\)".*/\1/p' $< | sed -e "s/$/.elc \/" -e "s/\.el\.elc/.el/" >> $@\
${AM_V_GEN}djecho "" >> $@
#"
/^ [ ]*\$(AM_V_at)\$(libsrc)\/make-docfile -d/s!make-docfile!make-docfile -o $(etc)/DOC!
/ > \$(etc)\/DOC *$/s/ >.*$//
/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-docfile.*>.*globals.tmp/s!make-docfile!make-docfile -o globals.tmp!
/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-doc/s!>.*$!!
/^\$(libsrc)\/make-docfile\$(EXEEXT): /i\
cd ../src
/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/b-emacs$(EXEEXT)/
/^ if test -f/,/^ fi$/c\ /^ if test -f/,/^ fi$/c\
command.com /c if exist .gdbinit rm -f _gdbinit command.com /c if exist .gdbinit rm -f _gdbinit
/^ *test "X\$(PAXCTL)" = X/d /^ *\$(PAXCTL_if_present) -zex/d
/^ *test "\$(CANNOT_DUMP)" = "yes"/d /^ *ln /s/ln /cp /
/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d /^ *\$(SETFATTR_if_present) -n/d
/^ *\$(SETFATTR) -n/d
/^ -\{0,1\} *ln /s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/
/^ fi/d /^ fi/d
/^ *\$(RUN_TEMACS) /i\
stubedit temacs.exe minstack=1024k
/^ *LC_ALL=C \$(RUN_TEMACS)/i\ /^ *LC_ALL=C \$(RUN_TEMACS)/i\
stubedit temacs.exe minstack=1024k stubedit temacs.exe minstack=1024k
/^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ /^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/
/-batch -l loadup/a\ /-batch -l loadup/a\
stubify emacs\ stubify emacs\
stubedit emacs.exe minstack=2048k stubedit emacs.exe minstack=3072k
s/ || exit 1\; \\$//
s/ || true\; \\$//
s/ @true *$/ @rem/ s/ @true *$/ @rem/
s/^ [^ ]*move-if-change / update / s/^ [^ ]*move-if-change / update /
/^ echo[ ][ ]*timestamp/s/echo /djecho / /^ [^ ]*echo[ ][ ]*timestamp/s/echo /djecho /
/^ .*djecho timestamp/a\ /^ .*djecho timestamp/a\
@rm -f gl.tmp @rm -f globals.tmp
/^ cd ..\/leim && \$(MAKE)/i\
$(RUN_TEMACS) -batch -l loadup dump\
stubify emacs\
stubedit emacs.exe minstack=2048k\
rm -f b-emacs$(EXEEXT)\
cp emacs$(EXEEXT) b-emacs$(EXEEXT)
/^ cd ..\/leim && \$(MAKE)/c\
$(MAKE) $(MFLAGS) -C ../leim leim-list.el EMACS=$(bootstrap_exe)
/^ cd ..\/admin\/unidata && \$(MAKE)/c\
$(MAKE) $(MFLAGS) -C ../admin/unidata all EMACS="../$(bootstrap_exe)"
/^ cd \$(lib) && \$(MAKE)/c\
$(MAKE) $(MFLAGS) -C $(lib) libgnu.a
/^RUN_TEMACS *=/s|`/bin/pwd`|.|
/^ *@\$(MKDEPDIR) *$/d /^ *@\$(MKDEPDIR) *$/d
/^ mv \.\/\.gdbinit/d /^ mv \.\/\.gdbinit/d
/^ if test -f/,/^ fi$/c\ /^ if test -f/,/^ fi$/c\
command.com /c if exist .gdbinit rm -f _gdbinit command.com /c if exist .gdbinit rm -f _gdbinit
/^ #/d /^ #/d
/^ cd.*make-docfile/s!$!; cd ../src!
/^ @: /d /^ @: /d
/^ -\{0,1\} *ln /s/ln /cp / /^ -\{0,1\} *ln /s/ln /cp /
/^[ ]touch /s/touch/djecho $@ >/ /^[ ]touch /s/touch/djecho $@ >/
s/@YMF_PASS_LDFLAGS@/flags/ s/@YMF_PASS_LDFLAGS@/flags/
s/@lisp_frag@//
s/@deps_frag@//
s/@ns_frag@//
s/@PRE_EDIT_LDFLAGS@// s/@PRE_EDIT_LDFLAGS@//
s/@POST_EDIT_LDFLAGS@// s/@POST_EDIT_LDFLAGS@//
s/bootstrap-emacs/b-emacs/ s/bootstrap-emacs/b-emacs/
...@@ -211,21 +207,24 @@ s/bootstrap-temacs/b-temacs/ ...@@ -211,21 +207,24 @@ s/bootstrap-temacs/b-temacs/
s/bootstrap-doc/b-doc/ s/bootstrap-doc/b-doc/
/rm -f bootstrap-emacs/s/b-emacs/b-emacs b-emacs.exe/ /rm -f bootstrap-emacs/s/b-emacs/b-emacs b-emacs.exe/
s/echo.*buildobj.lst/dj&/ s/echo.*buildobj.lst/dj&/
/ --load loadup bootstrap/i\
stubedit temacs.exe minstack=1024k
/ --load loadup bootstrap/a\ / --load loadup bootstrap/a\
stubify emacs stubify emacs
/^ mv -f emacs/a\ /^ mv -f emacs/a\
stubedit b-emacs.exe minstack=3072k\ stubedit b-emacs.exe minstack=3072k\
djecho bootlisp > bootlisp djecho bootlisp > bootlisp
/^ -\{0,1\}rm -f/s/\\#/#/ /^ -\{0,1\}rm -f/s/\\#/#/
/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src|
/^ *THEFILE=/s|$|\; cd ../src|
/^ echo.* buildobj.h/s|echo |djecho | /^ echo.* buildobj.h/s|echo |djecho |
/^buildobj\.h:/,/^ mv /{ /^buildobj\.h:/,/^ *\$(AM_V_at)mv /{
/^ *for /,/^ *done /c\ /^ *\$(AM_V_GEN)for /,/^ *done /c\
djecho "$(ALLOBJS)" | sed -e 's/^ */"/' -e 's/ *$$/"/' -e 's/ */", "/g' >>$@.tmp djecho "$(ALLOBJS)" | sed -e 's/^ */"/' -e 's/ *$$/"