aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2016-04-30 13:45:33 +0300
committerEli Zaretskii2016-04-30 13:45:33 +0300
commitccdaf04cfdaa42fb85d456274405cce32ee9f5d4 (patch)
tree631c59e4dad1db81cca00edeaa721ae8c0e522e5 /lisp
parentffe701cb07cfb3584c4e4894976f0c9487d02c59 (diff)
downloademacs-ccdaf04cfdaa42fb85d456274405cce32ee9f5d4.tar.gz
emacs-ccdaf04cfdaa42fb85d456274405cce32ee9f5d4.zip
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.el4
-rw-r--r--lisp/international/mule-cmds.el2
-rw-r--r--lisp/man.el4
-rw-r--r--lisp/progmodes/compile.el2
-rw-r--r--lisp/term/internal.el30
-rw-r--r--lisp/textmodes/ispell.el2
-rw-r--r--lisp/vc/diff.el2
-rw-r--r--lisp/window.el21
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."
800(defmacro eshell-do-pipelines-synchronously (pipeline) 800(defmacro eshell-do-pipelines-synchronously (pipeline)
801 "Execute the commands in PIPELINE in sequence synchronously. 801 "Execute the commands in PIPELINE in sequence synchronously.
802Output of each command is passed as input to the next one in the pipeline. 802Output of each command is passed as input to the next one in the pipeline.
803This is used on systems where `start-process' is not supported." 803This is used on systems where async subprocesses are not supported."
804 (when (setq pipeline (cadr pipeline)) 804 (when (setq pipeline (cadr pipeline))
805 `(progn 805 `(progn
806 ,(when (cdr pipeline) 806 ,(when (cdr pipeline)
@@ -838,7 +838,7 @@ This is used on systems where `start-process' is not supported."
838 "Execute the commands in PIPELINE, connecting each to one another." 838 "Execute the commands in PIPELINE, connecting each to one another."
839 `(let ((eshell-in-pipeline-p t) tailproc) 839 `(let ((eshell-in-pipeline-p t) tailproc)
840 (progn 840 (progn
841 ,(if (fboundp 'start-process) 841 ,(if (fboundp 'make-process)
842 `(eshell-do-pipelines ,pipeline) 842 `(eshell-do-pipelines ,pipeline)
843 `(let ((tail-handles (eshell-create-handles 843 `(let ((tail-handles (eshell-create-handles
844 (car (aref eshell-current-handles 844 (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 @@
72 (let ((map (make-sparse-keymap "Set Coding System"))) 72 (let ((map (make-sparse-keymap "Set Coding System")))
73 (bindings--define-key map [set-buffer-process-coding-system] 73 (bindings--define-key map [set-buffer-process-coding-system]
74 '(menu-item "For I/O with Subprocess" set-buffer-process-coding-system 74 '(menu-item "For I/O with Subprocess" set-buffer-process-coding-system
75 :visible (fboundp 'start-process) 75 :visible (fboundp 'make-process)
76 :enable (get-buffer-process (current-buffer)) 76 :enable (get-buffer-process (current-buffer))
77 :help "How to en/decode I/O from/to subprocess connected to this buffer")) 77 :help "How to en/decode I/O from/to subprocess connected to this buffer"))
78 (bindings--define-key map [set-next-selection-coding-system] 78 (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."
619 ;; `call-process' below sends it to /dev/null, 619 ;; `call-process' below sends it to /dev/null,
620 ;; so we don't need `2>' even with DOS shells 620 ;; so we don't need `2>' even with DOS shells
621 ;; which do support stderr redirection. 621 ;; which do support stderr redirection.
622 ((not (fboundp 'start-process)) " %s") 622 ((not (fboundp 'make-process)) " %s")
623 ((concat " %s 2>" null-device))))) 623 ((concat " %s 2>" null-device)))))
624 (flist Man-filter-list)) 624 (flist Man-filter-list))
625 (while (and flist (car flist)) 625 (while (and flist (car flist))
@@ -1080,7 +1080,7 @@ Return the buffer in which the manpage will appear."
1080 "[cleaning...]") 1080 "[cleaning...]")
1081 'face 'mode-line-emphasis))) 1081 'face 'mode-line-emphasis)))
1082 (Man-start-calling 1082 (Man-start-calling
1083 (if (fboundp 'start-process) 1083 (if (fboundp 'make-process)
1084 (let ((proc (start-process 1084 (let ((proc (start-process
1085 manual-program buffer 1085 manual-program buffer
1086 (if (memq system-type '(cygwin windows-nt)) 1086 (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."
1736 (funcall compilation-process-setup-function)) 1736 (funcall compilation-process-setup-function))
1737 (and outwin (compilation-set-window-height outwin)) 1737 (and outwin (compilation-set-window-height outwin))
1738 ;; Start the compilation. 1738 ;; Start the compilation.
1739 (if (fboundp 'start-process) 1739 (if (fboundp 'make-process)
1740 (let ((proc 1740 (let ((proc
1741 (if (eq mode t) 1741 (if (eq mode t)
1742 ;; comint uses `start-file-process'. 1742 ;; 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 @@
233 "U*!" "U*'" "R*;" "!:" ":'" "!*" nil nil nil "w*j" 233 "U*!" "U*'" "R*;" "!:" ":'" "!*" nil nil nil "w*j"
234 nil nil "w*?" nil "O*!" "O*'" "W*!" "W*'" "W*J" "/*" 234 nil nil "w*?" nil "O*!" "O*'" "W*!" "W*'" "W*J" "/*"
235 ";;" nil nil nil "1N" "1M" "3M" "4M" "6M" nil ; Gen Punct 235 ";;" nil nil nil "1N" "1M" "3M" "4M" "6M" nil ; Gen Punct
236 nil "1T" "1H" nil nil nil "LRM" "RLM" "-1" nil 236 nil "1T" "1H" nil nil nil "LRM" "RLM" "-" "-"
237 nil "--" "---" "===" "!2" "=2" "6`" "'9" ".9" "9'" 237 "-" "--" "---" "===" "!2" "=2" "'" "'" ".9" "9'"
238 "``" "''" ":9" "9``" "/-" "/=" "sb" "3b" nil ".." 238 "\"" "\"" ":9" "9``" "/-" "/=" "sb" "3b" nil ".."
239 "..." ".-" "LSep" "PSep" "LR[" "RL[" "PDF" "LRO" "RLO" 255 239 "..." ".-" "LSep" "PSep" "LR[" "RL[" "PDF" "LRO" "RLO" 255
240 "%o" "%oo" "'" "''" "\"'" "`" "``" "```" ".^" "<," 240 "%o" "%oo" "'" "''" "\"'" "`" "``" "```" ".^" "<,"
241 ",>" ":X" "!!" "?!" "'-" nil nil nil nil "-b" 241 ",>" ":X" "!!" "?!" "'-" nil nil nil nil "-b"
242 "/f" nil nil nil nil nil nil nil nil nil 242 "/f" nil nil "??" "?!" "!?" nil nil nil nil
243 nil nil nil nil nil nil nil nil nil nil 243 nil nil nil nil nil nil nil nil nil nil
244 nil nil nil nil nil nil nil nil nil nil 244 nil nil nil nil nil nil nil nil nil nil
245 nil nil nil nil nil nil nil nil nil nil 245 nil nil nil nil nil nil nil nil nil nil
@@ -265,17 +265,17 @@
265 "oK" "AO" nil nil "Est" nil nil nil nil nil 265 "oK" "AO" nil nil "Est" nil nil nil nil nil
266 nil "Aleph" "Bet" "Gimel" "Dalet" "=i=" nil nil nil nil 266 nil "Aleph" "Bet" "Gimel" "Dalet" "=i=" nil nil nil nil
267 nil nil nil nil nil nil nil nil nil nil 267 nil nil nil nil nil nil nil nil nil nil
268 nil nil nil nil nil nil nil nil nil nil 268 nil nil nil nil nil nil nil nil "1/7" "1/9"
269 nil "1/3" "2/3" "1/5" "2/5" "3/5" "4/5" "1/6" "5/6" "1/8" 269 "1/10" "1/3" "2/3" "1/5" "2/5" "3/5" "4/5" "1/6" "5/6" "1/8"
270 "3/8" "5/8" "7/8" "1/" ".I" "II" "III" "IV" ".V" "VI" 270 "3/8" "5/8" "7/8" "1/" ".I" "II" "III" "IV" ".V" "VI"
271 "VII" "VIII" "IX" "X" "XI" "XII" ".L" ".C" ".D" ".M" 271 "VII" "VIII" "IX" "X" "XI" "XII" ".L" ".C" ".D" ".M"
272 ".i" "ii" "iii" "iv" ".v" "vi" "vii" "viii" "ix" ".x" 272 ".i" "ii" "iii" "iv" ".v" "vi" "vii" "viii" "ix" ".x"
273 "xi" ".l" ".c" ".d" ".m" "CD" "DD" "CoD" "CI" nil 273 "xi" "xii" ".l" ".c" ".d" ".m" "CD" "DD" "CoD" "CI"
274 nil nil nil nil nil nil nil nil nil nil 274 nil nil nil nil nil nil nil nil nil nil
275 nil "<-" "|^" "->" "|v" "<->" "v|^" "^\\" "/^" "\\v" 275 nil nil "<-" "|^" "->" "|v" "<->" "v|^" "^\\" "/^"
276 "v/" "<-/" "/->" "<~" "~>" "<<-" "|^^" "->>" "|vv" "<-<" 276 "\\v" "v/" "<-/" "/->" "<~" "~>" "<<-" "|^^" "->>" "|vv"
277 ">->" "<-|" "_|^" "|->" "-|v" "_v|^" "<-?" "?->" "<-o" "o->" 277 "<-<" ">->" "<-|" "_|^" "|->" "-|v" "_v|^" "<-?" "?->" "<-o"
278 "<~>" "<-/>" nil nil nil nil nil nil nil nil 278 "o->" "<~>" "<-/>" nil nil nil nil nil nil nil
279 nil nil nil nil nil nil nil nil nil nil 279 nil nil nil nil nil nil nil nil nil nil
280 nil nil nil nil nil nil nil nil nil nil 280 nil nil nil nil nil nil nil nil nil nil
281 nil nil nil "<=/" "<=/>" "/=>" "<=" "||^" "=>" "||v" 281 nil nil nil "<=/" "<=/>" "/=>" "<=" "||^" "=>" "||v"
@@ -299,7 +299,7 @@
299 "~<'" "`>~" "/<'" "/`>" "(C" ")C" "/(C" "/)C" "(_" ")_" 299 "~<'" "`>~" "/<'" "/`>" "(C" ")C" "/(C" "/)C" "(_" ")_"
300 "/(_" "/)_" nil nil nil nil nil nil nil nil 300 "/(_" "/)_" nil nil nil nil nil nil nil nil
301 nil nil nil "0+" "0-" "0x" "0/" "0." "0o" "0*" 301 nil nil nil "0+" "0-" "0x" "0/" "0." "0o" "0*"
302 "0=" "0_" nil nil nil nil "|T" "T|" "-T" "_T" 302 "0=" "0_" nil nil nil nil "|-" "-|" "-T" "_T"
303 nil nil nil nil nil nil nil nil nil nil 303 nil nil nil nil nil nil nil nil nil nil
304 nil nil nil nil nil nil nil nil nil "-,-" 304 nil nil nil nil nil nil nil nil nil "-,-"
305 nil "XOR" "NAND" "NOR" nil nil nil nil nil nil 305 nil "XOR" "NAND" "NOR" nil nil nil nil nil nil
@@ -357,8 +357,10 @@
357 "M-o" "N-o" "O-o" "P-o" "Q-o" "R-o" "S-o" "T-o" "U-o" "V-o" 357 "M-o" "N-o" "O-o" "P-o" "Q-o" "R-o" "S-o" "T-o" "U-o" "V-o"
358 "W-o" "X-o" "Y-o" "Z-o" "a-o" "b-o" "c-o" "d-o" "e-o" "f-o" 358 "W-o" "X-o" "Y-o" "Z-o" "a-o" "b-o" "c-o" "d-o" "e-o" "f-o"
359 "g-o" "h-o" "i-o" "j-o" "k-o" "l-o" "m-o" "n-o" "o-o" "p-o" 359 "g-o" "h-o" "i-o" "j-o" "k-o" "l-o" "m-o" "n-o" "o-o" "p-o"
360 "q-o" "r-o" "s-o" "t-o" "u-o" "v-o" "w-o" "x-o" "y-o" "z-o" 360 "q-o" "r-o" "s-o" "t-o" "u-o" "v-o" "w-o" "x-o" "y-o" "z-o" "0-o" ]
361 "0-o" ] 361 )
362 (9733 9734
363 ["-!-" "-*-"]
362 ) 364 )
363 ) 365 )
364 366
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.")
1000(defvar ispell-async-processp (and (fboundp 'delete-process) 1000(defvar ispell-async-processp (and (fboundp 'delete-process)
1001 (fboundp 'process-send-string) 1001 (fboundp 'process-send-string)
1002 (fboundp 'accept-process-output) 1002 (fboundp 'accept-process-output)
1003 ;;(fboundp 'start-process) 1003 ;;(fboundp 'make-process)
1004 ;;(fboundp 'set-process-filter) 1004 ;;(fboundp 'set-process-filter)
1005 ;;(fboundp 'process-kill-without-query) 1005 ;;(fboundp 'process-kill-without-query)
1006 ) 1006 )
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:
167 (setq default-directory thisdir) 167 (setq default-directory thisdir)
168 (let ((inhibit-read-only t)) 168 (let ((inhibit-read-only t))
169 (insert command "\n")) 169 (insert command "\n"))
170 (if (and (not no-async) (fboundp 'start-process)) 170 (if (and (not no-async) (fboundp 'make-process))
171 (let ((proc (start-process "Diff" buf shell-file-name 171 (let ((proc (start-process "Diff" buf shell-file-name
172 shell-command-switch command))) 172 shell-command-switch command)))
173 (set-process-filter proc 'diff-process-filter) 173 (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."
8543 8543
8544(defun window--adjust-process-windows () 8544(defun window--adjust-process-windows ()
8545 "Update process window sizes to match the current window configuration." 8545 "Update process window sizes to match the current window configuration."
8546 (dolist (procwin (window--process-window-list)) 8546 (when (fboundp 'process-list)
8547 (let ((process (car procwin))) 8547 (dolist (procwin (window--process-window-list))
8548 (with-demoted-errors "Error adjusting window size: %S" 8548 (let ((process (car procwin)))
8549 (with-current-buffer (process-buffer process) 8549 (with-demoted-errors "Error adjusting window size: %S"
8550 (let ((size (funcall 8550 (with-current-buffer (process-buffer process)
8551 (or (process-get process 'adjust-window-size-function) 8551 (let ((size (funcall
8552 window-adjust-process-window-size-function) 8552 (or (process-get process 'adjust-window-size-function)
8553 process (cdr procwin)))) 8553 window-adjust-process-window-size-function)
8554 (when size 8554 process (cdr procwin))))
8555 (set-process-window-size process (cdr size) (car size))))))))) 8555 (when size
8556 (set-process-window-size process (cdr size) (car size))))))))))
8556 8557
8557(add-hook 'window-configuration-change-hook 'window--adjust-process-windows) 8558(add-hook 'window-configuration-change-hook 'window--adjust-process-windows)
8558 8559