File: 2-remove-nw

package info (click to toggle)
gnuserv 3.12.8-12
  • links: PTS
  • area: main
  • in suites: bookworm, forky, sid, trixie
  • size: 832 kB
  • sloc: ansic: 5,138; lisp: 1,572; makefile: 419; sh: 268
file content (95 lines) | stat: -rw-r--r-- 3,599 bytes parent folder | download | duplicates (3)
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
Author: Mike O'Connor <stew@vireo.org>
Subject: remove -nw feature that doesn't work with gnu emacs
diff -urNad gnuserv-3.12.7~/gnuclient.c gnuserv-3.12.7/gnuclient.c
--- gnuserv-3.12.7~/gnuclient.c	2002-09-15 06:14:37.000000000 -0400
+++ gnuserv-3.12.7/gnuclient.c	2006-10-18 00:13:56.000000000 -0400
@@ -403,7 +403,17 @@
 	  display = argv[i];
 	}
       else if (!strcmp (argv[i], "-nw"))
-	suppress_windows_system = 1;
+	{
+	  /* Since GNU Emacs doesn't support that feature and since
+	     this Debian package is supposed to work inly with GNU
+	     Emacs, disable it so that users are not advertised of a
+	     missing feature. */
+	  fprintf (stderr,
+		   "%s: `-nw' doesn't work with GNU Emacs, option disabled\n",
+		   progname);
+	  exit (1);
+/* 	suppress_windows_system = 1; */
+	}
       else
 	{
 	  /* Iterate over one-letter options. */
@@ -450,11 +460,11 @@
     {
       fprintf (stderr,
 #ifdef INTERNET_DOMAIN_SOCKETS
-	       "Usage: %s [-nw] [-display display] [-q] [-v] [-l library]\n"
+	       "Usage: %s [-display display] [-q] [-v] [-l library]\n"
                "       [-batch] [-f function] [-eval form]\n"
 	       "       [-h host] [-p port] [-r remote-path] [[+line] file] ...\n",
 #else /* !INTERNET_DOMAIN_SOCKETS */
-	       "Usage: %s [-nw] [-q] [-v] [-l library] [-f function] [-eval form] "
+	       "Usage: %s [-q] [-v] [-l library] [-f function] [-eval form] "
 	       "[[+line] path] ...\n",
 #endif /* !INTERNET_DOMAIN_SOCKETS */
 	       progname);
@@ -466,8 +476,8 @@
 	       progname);
       exit (1);
     }
-#if defined(INTERNET_DOMAIN_SOCKETS)
-  if (suppress_windows_system && hostarg)
+#ifdef INTERNET_DOMAIN_SOCKETS
+  if (suppress_windows_system && hostarg && (!batch))
     {
       fprintf (stderr, "%s: Remote editing is available only on X\n",
 	       progname);
diff -urNad gnuserv-3.12.7~/gnuserv.1 gnuserv-3.12.7/gnuserv.1
--- gnuserv-3.12.7~/gnuserv.1	2002-09-13 08:18:01.000000000 -0400
+++ gnuserv-3.12.7/gnuserv.1	2006-10-18 00:13:56.000000000 -0400
@@ -4,7 +4,7 @@
 gnuserv, gnuclient \- Server and Clients for XEmacs
 .SH SYNOPSIS
 .B gnuclient
-[-nw] [-display display] [-q] [-v] [-l library] [-batch] [-f function] [-eval form] 
+[-display display] [-q] [-v] [-l library] [-batch] [-f function] [-eval form] 
 [-h hostname] [-p port] [-r remote-pathname] [[+line] file] ...
 .br
 .B gnudoit [-q] 
@@ -31,8 +31,7 @@
 directly, but is started from XEmacs by loading the \fIgnuserv\fP
 package and evaluating the Lisp form (gnuserv-start).
 .PP
-\fIgnuattach\fP no longer exists. Its functionality has been replaced by
-\fIgnuclient -nw\fP.
+\fIgnuattach\fP no longer exists.
 .SH OPTIONS
 .PP 
 \fIgnuclient\fP supports as much of the command line options of Emacs as
@@ -41,14 +40,6 @@
 Options with long names can also be specified using a double
 hyphen instead of a single one.
 .TP 8
-.BI \-nw
-This option makes \fIgnuclient\fP act as a frontend such that XEmacs
-can attach to the current TTY. XEmacs will then open a new TTY frame.
-The effect is similar to having started a new XEmacs on this TTY with
-the ``-nw'' option. It currently only works if XEmacs is running on
-the same machine as gnuclient. This is the default if the `DISPLAY'
-environment variable is not set.
-.TP 8
 .BI \-display " display, " \--display " display" 
 If this option is given or the `DISPLAY' environment variable is set
 then gnuclient will tell XEmacs to edit files in a frame on the
@@ -150,7 +141,7 @@
 .br
 gnuclient -h cuckoo -r /ange@otter: /tmp/*
 .br
-gnuclient -nw ../src/listproc.c
+gnuclient ../src/listproc.c
 .RE
 .br