aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2004-06-16 15:10:55 +0000
committerKim F. Storm2004-06-16 15:10:55 +0000
commita0ecb2ac8eb6d2e72f255fe8e4acb607486d6c1d (patch)
treec811e23433c231305b9d4752b2f47cd1e7855fba
parente3d844638f6146703303c0c51e39916ea239b11b (diff)
downloademacs-a0ecb2ac8eb6d2e72f255fe8e4acb607486d6c1d.tar.gz
emacs-a0ecb2ac8eb6d2e72f255fe8e4acb607486d6c1d.zip
Update copyright.
-rw-r--r--src/abbrev.c2
-rw-r--r--src/atimer.c2
-rw-r--r--src/atimer.h2
-rw-r--r--src/blockinput.h2
-rw-r--r--src/buffer.h2
-rw-r--r--src/callproc.c18
-rw-r--r--src/casefiddle.c3
-rw-r--r--src/dispextern.h2
-rw-r--r--src/window.h2
-rw-r--r--src/xselect.c4
-rw-r--r--src/xsmfns.c2
-rw-r--r--src/xterm.c2
-rw-r--r--src/xterm.h2
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 @@
1/* Primitives for word-abbrev mode. 1/* Primitives for word-abbrev mode.
2 Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001 2 Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001,02,03,04
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This 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 @@
1/* Asynchronous timers. 1/* Asynchronous timers.
2 Copyright (C) 2000 Free Software Foundation, Inc. 2 Copyright (C) 2000, 2004 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
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 @@
1/* Asynchronous timers. 1/* Asynchronous timers.
2 Copyright (C) 2000 Free Software Foundation, Inc. 2 Copyright (C) 2000, 2003 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
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 @@
1/* blockinput.h - interface to blocking complicated interrupt-driven input. 1/* blockinput.h - interface to blocking complicated interrupt-driven input.
2 Copyright (C) 1989, 1993 Free Software Foundation, Inc. 2 Copyright (C) 1989, 1993, 2004 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
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 @@
1/* Header file for the buffer manipulation primitives. 1/* Header file for the buffer manipulation primitives.
2 Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000, 01, 2003 2 Copyright (C) 1985,86,93,94,95,97,98,99,2000,01,03,04
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This 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 @@
1/* Synchronous subprocess invocation for GNU Emacs. 1/* Synchronous subprocess invocation for GNU Emacs.
2 Copyright (C) 1985,86,87,88,93,94,95,99, 2000, 2001 2 Copyright (C) 1985,86,87,88,93,94,95,99, 2000,01,02,03,04
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -130,6 +130,8 @@ int synch_process_termsig;
130 this is exit code of synchronous subprocess. */ 130 this is exit code of synchronous subprocess. */
131int synch_process_retcode; 131int synch_process_retcode;
132 132
133extern Lisp_Object Qredisplay_dont_pause;
134
133extern Lisp_Object Vdoc_file_name; 135extern Lisp_Object Vdoc_file_name;
134 136
135extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system; 137extern 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) */)
220 int fd[2]; 222 int fd[2];
221 int filefd; 223 int filefd;
222 register int pid; 224 register int pid;
223 char buf[16384]; 225 char buf[16384*4];
224 char *bufptr = buf; 226 char *bufptr = buf;
225 int bufsize = 16384; 227 int bufsize = sizeof buf;
226 int count = SPECPDL_INDEX (); 228 int count = SPECPDL_INDEX ();
227 229
228 register const unsigned char **new_argv 230 register const unsigned char **new_argv
@@ -771,6 +773,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
771 773
772 if (this_read == 0) 774 if (this_read == 0)
773 { 775 {
776// fprintf(stderr, "read 0, total=%d\n", total_read);
774 process_coding.mode |= CODING_MODE_LAST_BLOCK; 777 process_coding.mode |= CODING_MODE_LAST_BLOCK;
775 break; 778 break;
776 } 779 }
@@ -778,6 +781,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
778 nread += this_read; 781 nread += this_read;
779 total_read += this_read; 782 total_read += this_read;
780 783
784// fprintf(stderr, "read %d+%d of %d, total=%d\n", nread, this_read, bufsize, total_read);
785
781 if (display_on_the_fly) 786 if (display_on_the_fly)
782 break; 787 break;
783 } 788 }
@@ -830,6 +835,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
830 continue; 835 continue;
831 } 836 }
832 837
838// fprintf(stderr, "produced %d\n", process_coding.produced);
839
833 if (process_coding.produced > 0) 840 if (process_coding.produced > 0)
834 insert_1_both (decoding_buf, process_coding.produced_char, 841 insert_1_both (decoding_buf, process_coding.produced_char,
835 process_coding.produced, 0, 1, 0); 842 process_coding.produced, 0, 1, 0);
@@ -929,10 +936,15 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
929 936
930 if (!NILP (display) && INTERACTIVE) 937 if (!NILP (display) && INTERACTIVE)
931 { 938 {
939 extern int windows_or_buffers_changed;
940 int count = SPECPDL_INDEX ();
941
932 if (first) 942 if (first)
933 prepare_menu_bars (); 943 prepare_menu_bars ();
934 first = 0; 944 first = 0;
945 specbind (Qredisplay_dont_pause, Qt);
935 redisplay_preserve_echo_area (1); 946 redisplay_preserve_echo_area (1);
947 unbind_to (count, Qnil);
936 } 948 }
937 immediate_quit = 1; 949 immediate_quit = 1;
938 QUIT; 950 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 @@
1/* GNU Emacs case conversion functions. 1/* GNU Emacs case conversion functions.
2 Copyright (C) 1985, 1994, 1997 Free Software Foundation, Inc. 2 Copyright (C) 1985,94,97,98,99, 2001, 2002, 2004
3 Free Software Foundation, Inc.
3 4
4This file is part of GNU Emacs. 5This file is part of GNU Emacs.
5 6
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 @@
1/* Interface definitions for display code. 1/* Interface definitions for display code.
2 Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003 2 Copyright (C) 1985,93,94,97,98,99, 2000,01,02,03, 2004
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This 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 @@
1/* Window definitions for GNU Emacs. 1/* Window definitions for GNU Emacs.
2 Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001, 2003 2 Copyright (C) 1985,86,93,95,97,98,99, 2000,01,03,04
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This 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 @@
1/* X Selection processing for Emacs. 1/* X Selection processing for Emacs.
2 Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003 2 Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004
3 Free Software Foundation. 3 Free Software Foundation.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -2576,7 +2576,7 @@ are ignored. */)
2576 if (event.xclient.format != 8 && event.xclient.format != 16 2576 if (event.xclient.format != 8 && event.xclient.format != 16
2577 && event.xclient.format != 32) 2577 && event.xclient.format != 32)
2578 error ("FORMAT must be one of 8, 16 or 32"); 2578 error ("FORMAT must be one of 8, 16 or 32");
2579 2579
2580 if (FRAMEP (dest) || NILP (dest)) 2580 if (FRAMEP (dest) || NILP (dest))
2581 { 2581 {
2582 struct frame *fdest = check_x_frame (dest); 2582 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 @@
1/* Session management module for systems which understand the X Session 1/* Session management module for systems which understand the X Session
2 management protocol. 2 management protocol.
3 Copyright (C) 2002 Free Software Foundation, Inc. 3 Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
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 @@
1/* X Communication module for terminals which understand the X protocol. 1/* X Communication module for terminals which understand the X protocol.
2 Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000, 01, 02, 2003 2 Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000,01,02,03,04
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This 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 @@
1/* Definitions and headers for communication with X protocol. 1/* Definitions and headers for communication with X protocol.
2 Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2001 2 Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000,01,02,03,04
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.