2 files changed, 9 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 75b70ee4752..29efd9f181c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify by assuming __fpending.
+        * dispnew.c: Include <fpending.h>, not <stdio_ext.h>.
+        (update_frame_1): Use __fpending, not PENDING_OUTPUT_COUNT.
+        Do not assume that __fpending's result fits in int.
+
 2012-11-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove EMACS_OUTQSIZE+sleep hack.
diff --git a/src/dispnew.c b/src/dispnew.c
index 2ddd29139af..907259a3e94 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -53,9 +53,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "systime.h"
 #include <errno.h>
 
-#ifdef DISPNEW_NEEDS_STDIO_EXT
-#include <stdio_ext.h>
-#endif
+#include <fpending.h>
 
 #if defined (HAVE_TERM_H) && defined (GNU_LINUX)
 #include <term.h>               /* for tgetent */
@@ -4647,7 +4645,7 @@ update_frame_1 (struct frame *f, bool force_p, bool inhibit_id_p)
               FILE *display_output = FRAME_TTY (f)->output;
               if (display_output)
                 {
-                  int outq = PENDING_OUTPUT_COUNT (display_output);
+                  ptrdiff_t outq = __fpending (display_output);
                   if (outq > 900
                       || (outq > 20 && ((i - 1) % preempt_count == 0)))
                     fflush (display_output);