Emacs update breaks wl

Hi,

the following commit to Emacs trunk breaks wl:

commit f1c48b0ec521744826ed43ae27eed0e152c472bf
Author: Glenn Morris
Date:   Sat Mar 10 19:15:56 2018 -0800

    Remove many items obsolete since Emacs 22.1

Is this patch correct? At least I can use wl again. :)

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index 06813ddb..70ccc6bc 100644
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -324,7 +324,7 @@ Returns a process object.  if making session failed, returns nil."
         (sit-for 1))
        (signal (car err) (cdr err))))
     (when process
-      (process-kill-without-query process)
+      (set-process-query-on-exit-flag process nil)
       (when auto-plugged
        (elmo-set-plugged t server service
                          (elmo-network-stream-type-symbol stream-type)))
diff --git a/utils/ssl.el b/utils/ssl.el
index 7006955d..97fd9404 100644
--- a/utils/ssl.el
+++ b/utils/ssl.el
@@ -194,7 +194,7 @@ specifying a port number to connect to."
         (proc (eval
                `(start-process name buffer ssl-program-name
                                ,@ssl-program-arguments))))
-    (process-kill-without-query proc)
+    (set-process-query-on-exit-flag proc nil)
     proc))


--
Herbert