Verify the version of Emacsclient.

lib-src/emacsclient.c (main): Send the version number of emacsclient
to the Emacs process, and exit with error if Emacs does not accept it.

lisp/server.el (server-with-errors-reported): Removed.
(server-process-filter): Cleaned up error handling.
Compare the version of emacsclient with emacs-version; 
signal an error if they do not match.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-84

1 files changed, 17 insertions, 1 deletions

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 90224fe51ee..3bb2b70ba6d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -562,6 +562,9 @@ To start the server in Emacs, type \"M-x server-start\".\n",
       fail ();
     }
 
+  /* First of all, send our version number for verification. */
+  fprintf (out, "-version %s ", VERSION);
+  
   if (nowait)
     fprintf (out, "-nowait ");
 
@@ -650,7 +653,20 @@ To start the server in Emacs, type \"M-x server-start\".\n",
   /* Now, wait for an answer and print any messages.  */
   while ((str = fgets (string, BUFSIZ, in)))
     {
-      if (strprefix ("-emacs-pid ", str))
+      if (strprefix ("-good-version ", str))
+        {
+          /* OK, we got the green light. */
+        }
+      else if (strprefix ("-bad-version ", str))
+        {
+          if (str[strlen (str) - 1] == '\n')
+            str[strlen (str) - 1] = 0;
+          
+          fprintf (stderr, "%s: Version mismatch: Emacs is %s, but we are %s\n",
+                   argv[0], str + strlen ("-bad-version "), VERSION);
+          fail ();
+        }
+      else if (strprefix ("-emacs-pid ", str))
         {
           emacs_pid = strtol (string + strlen ("-emacs-pid"), NULL, 10);
         }