From a0ecb2ac8eb6d2e72f255fe8e4acb607486d6c1d Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 16 Jun 2004 15:10:55 +0000 Subject: [PATCH] Update copyright. --- src/abbrev.c | 2 +- src/atimer.c | 2 +- src/atimer.h | 2 +- src/blockinput.h | 2 +- src/buffer.h | 2 +- src/callproc.c | 18 +++++++++++++++--- src/casefiddle.c | 3 ++- src/dispextern.h | 2 +- src/window.h | 2 +- src/xselect.c | 4 ++-- src/xsmfns.c | 2 +- src/xterm.c | 2 +- src/xterm.h | 2 +- 13 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/abbrev.c b/src/abbrev.c index 41e329ac95d..ac132f20023 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -1,5 +1,5 @@ /* Primitives for word-abbrev mode. - Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001 + Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001,02,03,04 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.c b/src/atimer.c index 2ddc7427f56..7e78bdad9c0 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.h b/src/atimer.h index 3ecc97e5511..f987a47a6bd 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2003 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/blockinput.h b/src/blockinput.h index e9f2f3bc217..a4c8a9b9c22 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -1,5 +1,5 @@ /* blockinput.h - interface to blocking complicated interrupt-driven input. - Copyright (C) 1989, 1993 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.h b/src/buffer.h index b5227cb9981..e59211d4111 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,5 +1,5 @@ /* Header file for the buffer manipulation primitives. - Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000, 01, 2003 + Copyright (C) 1985,86,93,94,95,97,98,99,2000,01,03,04 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callproc.c b/src/callproc.c index 73d81d81b18..10e98ad1a36 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,5 +1,5 @@ /* Synchronous subprocess invocation for GNU Emacs. - Copyright (C) 1985,86,87,88,93,94,95,99, 2000, 2001 + Copyright (C) 1985,86,87,88,93,94,95,99, 2000,01,02,03,04 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -130,6 +130,8 @@ int synch_process_termsig; this is exit code of synchronous subprocess. */ int synch_process_retcode; +extern Lisp_Object Qredisplay_dont_pause; + extern Lisp_Object Vdoc_file_name; extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system; @@ -220,9 +222,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) int fd[2]; int filefd; register int pid; - char buf[16384]; + char buf[16384*4]; char *bufptr = buf; - int bufsize = 16384; + int bufsize = sizeof buf; int count = SPECPDL_INDEX (); register const unsigned char **new_argv @@ -771,6 +773,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) if (this_read == 0) { +// fprintf(stderr, "read 0, total=%d\n", total_read); process_coding.mode |= CODING_MODE_LAST_BLOCK; break; } @@ -778,6 +781,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) nread += this_read; total_read += this_read; +// fprintf(stderr, "read %d+%d of %d, total=%d\n", nread, this_read, bufsize, total_read); + if (display_on_the_fly) break; } @@ -830,6 +835,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) continue; } +// fprintf(stderr, "produced %d\n", process_coding.produced); + if (process_coding.produced > 0) insert_1_both (decoding_buf, process_coding.produced_char, process_coding.produced, 0, 1, 0); @@ -929,10 +936,15 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) if (!NILP (display) && INTERACTIVE) { + extern int windows_or_buffers_changed; + int count = SPECPDL_INDEX (); + if (first) prepare_menu_bars (); first = 0; + specbind (Qredisplay_dont_pause, Qt); redisplay_preserve_echo_area (1); + unbind_to (count, Qnil); } immediate_quit = 1; QUIT; diff --git a/src/casefiddle.c b/src/casefiddle.c index 6387c4bc845..4672bd317b9 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -1,5 +1,6 @@ /* GNU Emacs case conversion functions. - Copyright (C) 1985, 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1985,94,97,98,99, 2001, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispextern.h b/src/dispextern.h index 6583e6a40c4..10754a4c01d 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1,5 +1,5 @@ /* Interface definitions for display code. - Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003 + Copyright (C) 1985,93,94,97,98,99, 2000,01,02,03, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.h b/src/window.h index ab79b0eaad9..1e53ae659cb 100644 --- a/src/window.h +++ b/src/window.h @@ -1,5 +1,5 @@ /* Window definitions for GNU Emacs. - Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001, 2003 + Copyright (C) 1985,86,93,95,97,98,99, 2000,01,03,04 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xselect.c b/src/xselect.c index b4d61f7c9a9..7be238651a0 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1,5 +1,5 @@ /* X Selection processing for Emacs. - Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003 + Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004 Free Software Foundation. This file is part of GNU Emacs. @@ -2576,7 +2576,7 @@ are ignored. */) if (event.xclient.format != 8 && event.xclient.format != 16 && event.xclient.format != 32) error ("FORMAT must be one of 8, 16 or 32"); - + if (FRAMEP (dest) || NILP (dest)) { struct frame *fdest = check_x_frame (dest); diff --git a/src/xsmfns.c b/src/xsmfns.c index e486e5c6e32..9a6a7ccefb8 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -1,6 +1,6 @@ /* Session management module for systems which understand the X Session management protocol. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.c b/src/xterm.c index 60ec7ec8830..c7b0c2f0a45 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1,5 +1,5 @@ /* X Communication module for terminals which understand the X protocol. - Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000, 01, 02, 2003 + Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000,01,02,03,04 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.h b/src/xterm.h index 9436f44ed6f..1ff0201928d 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication with X protocol. - Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2001 + Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000,01,02,03,04 Free Software Foundation, Inc. This file is part of GNU Emacs. -- 2.39.5