Remove no-longer-used pty_max_bytes variable.

* configure.ac (fpathconf): Remove unnecessary check.
* admin/CPP-DEFINES (HAVE_FPATHCONF): Remove.
* src/process.c (pty_max_bytes): Remove; unused.
(send_process): Do not set it.

diff --git a/ChangeLog b/ChangeLog
index f5f649aae6d1b7844fabef7abb2823dd90f50f94..1e5bf54a8970acb59103be26fd715127469579de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Remove no-longer-used pty_max_bytes variable.
+       * configure.ac (fpathconf): Remove unnecessary check.
+
 2012-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use faccessat, not access, when checking file permissions (Bug#12632).

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 0a4c14cb95cd060da25b9fdeaf4b21b3cfcecc89..17c56dc7e9e5c32136b4fbd7e32f5b51bff21bd1 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -152,7 +152,6 @@ HAVE_ENVIRON_DECL
 HAVE_EUIDACCESS
 HAVE_FCNTL_H
 HAVE_FORK
-HAVE_FPATHCONF
 HAVE_FREEIFADDRS
 HAVE_FREETYPE
 HAVE_FSEEKO

diff --git a/admin/ChangeLog b/admin/ChangeLog
index fd28bf1228f4dd866a779dc0cb4d23dcbd2668e0..4eb413e948f0e017c92bde17c8ee9494fe049410 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Remove no-longer-used pty_max_bytes variable.
+       * CPP-DEFINES (HAVE_FPATHCONF): Remove.
+
 2012-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use faccessat, not access, when checking file permissions (Bug#12632).

diff --git a/configure.ac b/configure.ac
index b0c81a23f8ad1a8771a1107834b620744ce9a2d3..937c645bb58644ba38e30bb40be8bca4ba9fcb7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2874,7 +2874,7 @@ AC_SUBST(BLESSMAIL_TARGET)
 AC_CHECK_FUNCS(gethostname \
 closedir getrusage get_current_dir_name \
 lrand48 \
-fpathconf select getpagesize setlocale \
+select getpagesize setlocale \
 utimes getrlimit setrlimit getcwd shutdown getaddrinfo \
 strsignal setitimer \
 sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \

diff --git a/src/ChangeLog b/src/ChangeLog
index 8caaa2f68e033f742310abd77248f3801eb2d6ff..c9c754f86779b5caa72c835250504d770c0144e1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Remove no-longer-used pty_max_bytes variable.
+       * process.c (pty_max_bytes): Remove; unused.
+       (send_process): Do not set it.
+
 2012-11-15  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in ($(BLD)/dispnew.$(O), $(BLD)/emacs.$(O)):

diff --git a/src/process.c b/src/process.c
index 728abebe75895d7ac201f63a6595cecc8fafa9ec..785282fba36b530df42dbd2d819345616f00f572 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -340,9 +340,6 @@ static struct sockaddr_and_len {
 #define DATAGRAM_CONN_P(proc)  (0)
 #endif
 
-/* Maximum number of bytes to send to a pty without an eof.  */
-static int pty_max_bytes;
-
 /* These setters are used only in this file, so they can be private.  */
 static void
 pset_buffer (struct Lisp_Process *p, Lisp_Object val)
@@ -5532,19 +5529,6 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len,
       buf = SSDATA (object);
     }
 
-  if (pty_max_bytes == 0)
-    {
-#if defined (HAVE_FPATHCONF) && defined (_PC_MAX_CANON)
-      pty_max_bytes = fpathconf (p->outfd, _PC_MAX_CANON);
-      if (pty_max_bytes < 0)
-       pty_max_bytes = 250;
-#else
-      pty_max_bytes = 250;
-#endif
-      /* Deduct one, to leave space for the eof.  */
-      pty_max_bytes--;
-    }
-
   /* If there is already data in the write_queue, put the new data
      in the back of queue.  Otherwise, ignore it.  */
   if (!NILP (p->write_queue))