[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/02 23:16:34

Index: emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- emacsclient.c       2 Nov 2008 21:41:57 -0000       1.139
+++ emacsclient.c       2 Nov 2008 23:16:33 -0000       1.140
@@ -995,6 +995,57 @@
   return !strncmp (prefix, string, strlen (prefix));
 }
 
+/* Get tty name and type.  If successful, return the type in TTY_TYPE
+   and the name in TTY_NAME, and return 1.  Otherwise, fail if NOABORT
+   is zero, or return 0 if NOABORT is non-zero.  */
+
+int
+find_tty (char **tty_type, char **tty_name, int noabort)
+{
+  char *type = egetenv ("TERM");
+  char *name = ttyname (fileno (stdout));
+
+  if (!name)
+    {
+      if (noabort)
+       return 0;
+      else
+       {
+         message (TRUE, "%s: could not get terminal name\n", progname);
+         fail ();
+       }
+    }
+
+  if (!type)
+    {
+      if (noabort)
+       return 0;
+      else
+       {
+         message (TRUE, "%s: please set the TERM variable to your terminal 
type\n",
+                  progname);
+         fail ();
+       }
+    }
+
+  if (strcmp (type, "eterm") == 0)
+    {
+      if (noabort)
+       return 0;
+      else
+       {
+         /* This causes nasty, MULTI_KBOARD-related input lockouts. */
+         message (TRUE, "%s: opening a frame in an Emacs term buffer"
+                  " is not supported\n", progname);
+         fail ();
+       }
+    }
+
+  *tty_name = name;
+  *tty_type = type;
+  return 1;
+}
+
 
 #if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
 
@@ -1085,58 +1136,6 @@
 }
 
 
-/* Get tty name and type.  If successful, return the type in TTY_TYPE
-   and the name in TTY_NAME, and return 1.  Otherwise, fail if NOABORT
-   is zero, or return 0 if NOABORT is non-zero.  */
-
-int
-find_tty (char **tty_type, char **tty_name, int noabort)
-{
-  char *type = egetenv ("TERM");
-  char *name = ttyname (fileno (stdout));
-
-  if (!name)
-    {
-      if (noabort)
-       return 0;
-      else
-       {
-         message (TRUE, "%s: could not get terminal name\n", progname);
-         fail ();
-       }
-    }
-
-  if (!type)
-    {
-      if (noabort)
-       return 0;
-      else
-       {
-         message (TRUE, "%s: please set the TERM variable to your terminal 
type\n",
-                  progname);
-         fail ();
-       }
-    }
-
-  if (strcmp (type, "eterm") == 0)
-    {
-      if (noabort)
-       return 0;
-      else
-       {
-         /* This causes nasty, MULTI_KBOARD-related input lockouts. */
-         message (TRUE, "%s: opening a frame in an Emacs term buffer"
-                  " is not supported\n", progname);
-         fail ();
-       }
-    }
-
-  *tty_name = name;
-  *tty_type = type;
-  return 1;
-}
-
-
 /* Set up signal handlers before opening a frame on the current tty.  */
 
 void