diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-04-30 13:45:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-04-30 13:45:33 +0300 |
| commit | ccdaf04cfdaa42fb85d456274405cce32ee9f5d4 (patch) | |
| tree | 631c59e4dad1db81cca00edeaa721ae8c0e522e5 /lisp | |
| parent | ffe701cb07cfb3584c4e4894976f0c9487d02c59 (diff) | |
| download | emacs-ccdaf04cfdaa42fb85d456274405cce32ee9f5d4.tar.gz | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/eshell/esh-cmd.el | 4 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 2 | ||||
| -rw-r--r-- | lisp/man.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 2 | ||||
| -rw-r--r-- | lisp/term/internal.el | 30 | ||||
| -rw-r--r-- | lisp/textmodes/ispell.el | 2 | ||||
| -rw-r--r-- | lisp/vc/diff.el | 2 | ||||
| -rw-r--r-- | lisp/window.el | 21 |
8 files changed, 35 insertions, 32 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 60615131e20..d3613d31405 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -800,7 +800,7 @@ This macro calls itself recursively, with NOTFIRST non-nil." (defmacro eshell-do-pipelines-synchronously (pipeline) "Execute the commands in PIPELINE in sequence synchronously. 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)) `(progn ,(when (cdr pipeline) @@ -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." `(let ((eshell-in-pipeline-p t) tailproc) (progn - ,(if (fboundp 'start-process) + ,(if (fboundp 'make-process) `(eshell-do-pipelines ,pipeline) `(let ((tail-handles (eshell-create-handles (car (aref eshell-current-handles diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index dbf12247fc6..001aad14754 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -72,7 +72,7 @@ (let ((map (make-sparse-keymap "Set Coding System"))) (bindings--define-key map [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)) :help "How to en/decode I/O from/to subprocess connected to this buffer")) (bindings--define-key map [set-next-selection-coding-system] diff --git a/lisp/man.el b/lisp/man.el index b483dd12e8a..2b2ee99a9be 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -619,7 +619,7 @@ This is necessary if one wants to dump man.el with Emacs." ;; `call-process' below sends it to /dev/null, ;; so we don't need `2>' even with DOS shells ;; which do support stderr redirection. - ((not (fboundp 'start-process)) " %s") + ((not (fboundp 'make-process)) " %s") ((concat " %s 2>" null-device))))) (flist Man-filter-list)) (while (and flist (car flist)) @@ -1080,7 +1080,7 @@ Return the buffer in which the manpage will appear." "[cleaning...]") 'face 'mode-line-emphasis))) (Man-start-calling - (if (fboundp 'start-process) + (if (fboundp 'make-process) (let ((proc (start-process manual-program buffer (if (memq system-type '(cygwin windows-nt)) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index b7ab408f744..dbda8a9d5b8 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1736,7 +1736,7 @@ Returns the compilation buffer created." (funcall compilation-process-setup-function)) (and outwin (compilation-set-window-height outwin)) ;; Start the compilation. - (if (fboundp 'start-process) + (if (fboundp 'make-process) (let ((proc (if (eq mode t) ;; comint uses `start-file-process'. diff --git a/lisp/term/internal.el b/lisp/term/internal.el index f026c66b2a3..6f4866b0795 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el @@ -233,13 +233,13 @@ "U*!" "U*'" "R*;" "!:" ":'" "!*" nil nil nil "w*j" nil nil "w*?" nil "O*!" "O*'" "W*!" "W*'" "W*J" "/*" ";;" nil nil nil "1N" "1M" "3M" "4M" "6M" nil ; Gen Punct - nil "1T" "1H" nil nil nil "LRM" "RLM" "-1" nil - nil "--" "---" "===" "!2" "=2" "6`" "'9" ".9" "9'" - "``" "''" ":9" "9``" "/-" "/=" "sb" "3b" nil ".." + nil "1T" "1H" nil nil nil "LRM" "RLM" "-" "-" + "-" "--" "---" "===" "!2" "=2" "'" "'" ".9" "9'" + "\"" "\"" ":9" "9``" "/-" "/=" "sb" "3b" nil ".." "..." ".-" "LSep" "PSep" "LR[" "RL[" "PDF" "LRO" "RLO" 255 "%o" "%oo" "'" "''" "\"'" "`" "``" "```" ".^" "<," ",>" ":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 @@ -265,17 +265,17 @@ "oK" "AO" nil nil "Est" nil 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 "1/3" "2/3" "1/5" "2/5" "3/5" "4/5" "1/6" "5/6" "1/8" + nil nil nil nil nil nil nil nil "1/7" "1/9" + "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" "VII" "VIII" "IX" "X" "XI" "XII" ".L" ".C" ".D" ".M" ".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 "<-" "|^" "->" "|v" "<->" "v|^" "^\\" "/^" "\\v" - "v/" "<-/" "/->" "<~" "~>" "<<-" "|^^" "->>" "|vv" "<-<" - ">->" "<-|" "_|^" "|->" "-|v" "_v|^" "<-?" "?->" "<-o" "o->" - "<~>" "<-/>" nil nil nil nil nil nil nil nil + nil nil "<-" "|^" "->" "|v" "<->" "v|^" "^\\" "/^" + "\\v" "v/" "<-/" "/->" "<~" "~>" "<<-" "|^^" "->>" "|vv" + "<-<" ">->" "<-|" "_|^" "|->" "-|v" "_v|^" "<-?" "?->" "<-o" + "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 "<=/" "<=/>" "/=>" "<=" "||^" "=>" "||v" @@ -299,7 +299,7 @@ "~<'" "`>~" "/<'" "/`>" "(C" ")C" "/(C" "/)C" "(_" ")_" "/(_" "/)_" nil nil nil nil nil nil nil nil 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 "XOR" "NAND" "NOR" nil nil nil nil nil nil @@ -357,8 +357,10 @@ "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" "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" - "0-o" ] + "q-o" "r-o" "s-o" "t-o" "u-o" "v-o" "w-o" "x-o" "y-o" "z-o" "0-o" ] + ) + (9733 9734 + ["-!-" "-*-"] ) ) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index db03a3244a4..0cedf86bb73 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1000,7 +1000,7 @@ and added as a submenu of the \"Edit\" menu.") (defvar ispell-async-processp (and (fboundp 'delete-process) (fboundp 'process-send-string) (fboundp 'accept-process-output) - ;;(fboundp 'start-process) + ;;(fboundp 'make-process) ;;(fboundp 'set-process-filter) ;;(fboundp 'process-kill-without-query) ) diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index a8c3fcca2fc..6b316c4073c 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -167,7 +167,7 @@ Possible values are: (setq default-directory thisdir) (let ((inhibit-read-only t)) (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 shell-command-switch command))) (set-process-filter proc 'diff-process-filter) diff --git a/lisp/window.el b/lisp/window.el index d9ac0e6d240..f7a547b915a 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -8543,16 +8543,17 @@ displaying that processes's buffer." (defun window--adjust-process-windows () "Update process window sizes to match the current window configuration." - (dolist (procwin (window--process-window-list)) - (let ((process (car procwin))) - (with-demoted-errors "Error adjusting window size: %S" - (with-current-buffer (process-buffer process) - (let ((size (funcall - (or (process-get process 'adjust-window-size-function) - window-adjust-process-window-size-function) - process (cdr procwin)))) - (when size - (set-process-window-size process (cdr size) (car size))))))))) + (when (fboundp 'process-list) + (dolist (procwin (window--process-window-list)) + (let ((process (car procwin))) + (with-demoted-errors "Error adjusting window size: %S" + (with-current-buffer (process-buffer process) + (let ((size (funcall + (or (process-get process 'adjust-window-size-function) + window-adjust-process-window-size-function) + process (cdr procwin)))) + (when size + (set-process-window-size process (cdr size) (car size)))))))))) (add-hook 'window-configuration-change-hook 'window--adjust-process-windows) |
