From 6abdafd270c06d47a47d466e8a5af02c011ad9cb Mon Sep 17 00:00:00 2001 From: jcaw <40725916+jcaw@users.noreply.github.com> Date: Sat, 1 Jun 2019 08:13:14 -0700 Subject: [PATCH] Make Elnode work on Emacs 26.1 Elnode doesn't work on Emacs 26.1, because it disallows both the `:nowait` and `:server` parameters. Add a cautious fix for this, which flips `:nowait` to nil when Emacs is on 26.1 upwards. This is the same method used by `emacs-http-server` to fix the same bug. Initial fix: https://github.com/eschulte/emacs-web-server/pull/9 26.1-only patch: https://github.com/eschulte/emacs-web-server/commit/cafa5b7582c57252a0884b2c33da9b18fb678713 --- elnode.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elnode.el b/elnode.el index 062d153..140f329 100644 --- a/elnode.el +++ b/elnode.el @@ -1300,7 +1300,7 @@ Serves only to connect the server process to the client processes" :name "*elnode-webserver-proc*" :buffer an-buf :server t - :nowait 't + :nowait (< emacs-major-version 26) :host (cond ((equal host "localhost") 'local) ((equal host "*") nil) @@ -1447,7 +1447,7 @@ The port is chosen randomly from the ephemeral ports. " (make-network-process :name "*test-proc*" :server t - :nowait 't + :nowait (< emacs-major-version 26) :host 'local :service port :family 'ipv4))