1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111
|
Subject: Use set-process-query-on-exit-flag if available
Author: Tatsuya Kinoshita <tats@debian.org>
To fix void-function process-kill-without-query in Emacs trunk (27.0.50),
use set-process-query-on-exit-flag instead.
diff --git a/lisp/lookup-kanji.el b/lisp/lookup-kanji.el
index 6cd07cb..e2d2424 100644
--- a/lisp/lookup-kanji.el
+++ b/lisp/lookup-kanji.el
@@ -68,7 +68,9 @@
lookup-kanji-command
lookup-kanji-option)))
(sit-for 0.1)
- (process-kill-without-query lookup-kanji-process))
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (set-process-query-on-exit-flag lookup-kanji-process nil)
+ (process-kill-without-query lookup-kanji-process)))
lookup-kanji-process)
(defun lookup-kanji-send-string (str)
diff --git a/lisp/ndeb.el b/lisp/ndeb.el
index 50a10cd..e68d140 100644
--- a/lisp/ndeb.el
+++ b/lisp/ndeb.el
@@ -363,7 +363,9 @@
(cons directory (if appendix (list appendix))))))
(buffer (lookup-open-process-buffer (concat " *ndeb+" directory "*")))
(process (apply 'start-process "ndeb" buffer ndeb-program-name args)))
- (process-kill-without-query process)
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (set-process-query-on-exit-flag process nil)
+ (process-kill-without-query process))
(accept-process-output process)
(with-current-buffer (or buffer (lookup-temp-buffer))
(save-excursion
diff --git a/lisp/ndict.el b/lisp/ndict.el
index 138703f..30daf6a 100644
--- a/lisp/ndict.el
+++ b/lisp/ndict.el
@@ -231,7 +231,9 @@
(let* ((buffer (lookup-open-process-buffer " *ndict*"))
(process (open-network-stream "ndict" buffer server service)))
(accept-process-output process)
- (process-kill-without-query process)
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (set-process-query-on-exit-flag process nil)
+ (process-kill-without-query process))
process))
(put 'ndict-process-require 'lisp-indent-function 1)
diff --git a/lisp/ndkks.el b/lisp/ndkks.el
index eb7bdcc..bcb9284 100644
--- a/lisp/ndkks.el
+++ b/lisp/ndkks.el
@@ -155,7 +155,9 @@
(let ((buffer (lookup-open-process-buffer " *ndkks*")))
(setq process (apply 'start-process "ndkks" buffer
ndkks-program-name args))
- (process-kill-without-query process)
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (set-process-query-on-exit-flag process nil)
+ (process-kill-without-query process))
;; $B5/F08e!">/$7;~4V$rCV$+$J$$$H!":G=i$N8!:w$,$&$^$/$$$+$J$$!#(B
(sleep-for 0.1)
(let ((coding ndkks-process-coding-system))
diff --git a/lisp/ndspell.el b/lisp/ndspell.el
index 7aeaa60..c2a25c8 100644
--- a/lisp/ndspell.el
+++ b/lisp/ndspell.el
@@ -184,7 +184,9 @@
(setq ndspell-process
(start-process "ndspell" buffer ndspell-ispell-program
"-a" "-m" "-C"))
- (process-kill-without-query ndspell-process)
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (set-process-query-on-exit-flag ndspell-process nil)
+ (process-kill-without-query ndspell-process))
(accept-process-output ndspell-process)
(let ((coding ndspell-process-coding-system))
(when coding
diff --git a/lisp/ndtp.el b/lisp/ndtp.el
index 54b1341..6d2efc8 100644
--- a/lisp/ndtp.el
+++ b/lisp/ndtp.el
@@ -299,7 +299,9 @@
(lookup-proceeding-message (format "connecting to %s..." server))
(let* ((buffer (lookup-open-process-buffer (concat " *ndtp+" server "*")))
(process (open-network-stream "ndtp" buffer server service)))
- (process-kill-without-query process)
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (set-process-query-on-exit-flag process nil)
+ (process-kill-without-query process))
process))
(put 'ndtp-process-require 'lisp-indent-function 2)
diff --git a/lisp/sdicf.el b/lisp/sdicf.el
index df763f2..02ea0d8 100644
--- a/lisp/sdicf.el
+++ b/lisp/sdicf.el
@@ -344,7 +344,9 @@ sdicf-egrep-command $B$G;XDj$5$l$?%3%^%s%I$r;H$&!#(B"
(accept-process-output proc)
(process-send-string proc "order index\n")
(accept-process-output proc)
- (process-kill-without-query proc)
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (set-process-query-on-exit-flag proc nil)
+ (process-kill-without-query proc))
(set-process-filter proc 'sdicf-array-wait-prompt)
t))))
|