From cac87e302e52bae078f22a786ca3d9e2407683c4 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 18:27:09 +0000 Subject: (Fexpt): Use floats for negative exponent. --- src/ChangeLog | 5 +++++ src/floatfns.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 6d8608dde22..9ff58e7f5a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-08-06 Thien-Thi Nguyen + + * floatfns.c (Fexpt): Use floats for negative + exponent (computing a root). Reported by D Goel. + 2005-08-02 Richard M. Stallman * frame.c (Fframe_char_width): Doc fix. diff --git a/src/floatfns.c b/src/floatfns.c index 529e7b76e39..cbcc0bfe520 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -460,7 +460,8 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg1); CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ - && INTEGERP (arg2)) /* don't promote, if both are ints */ + && INTEGERP (arg2) /* don't promote, if both are ints, and */ + && 0 <= XINT (arg2)) /* we are not computing the -ARG2 root */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; -- cgit v1.2.1 From 2a205424e771703217ce8c6b4252d810d3310cd2 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 00:57:10 +0000 Subject: Munge comment associated w/ last change to describe intent; nfc. --- src/ChangeLog | 4 ++-- src/floatfns.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 9ff58e7f5a8..aa73da64547 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ 2005-08-06 Thien-Thi Nguyen - * floatfns.c (Fexpt): Use floats for negative - exponent (computing a root). Reported by D Goel. + * floatfns.c (Fexpt): Use floats for negative exponent. + Reported by D Goel. 2005-08-02 Richard M. Stallman diff --git a/src/floatfns.c b/src/floatfns.c index cbcc0bfe520..0f91b80370a 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -461,7 +461,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ && INTEGERP (arg2) /* don't promote, if both are ints, and */ - && 0 <= XINT (arg2)) /* we are not computing the -ARG2 root */ + && 0 <= XINT (arg2)) /* we are sure the result is not fractional */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; -- cgit v1.2.1 From b908093d26f9e68e5058caddf918c9420908286a Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 09:52:28 +0000 Subject: Update years in copyright notice; nfc. --- src/m/7300.h | 2 +- src/m/acorn.h | 2 +- src/m/alliant-2800.h | 2 +- src/m/alliant.h | 3 ++- src/m/alpha.h | 3 ++- src/m/altos.h | 3 ++- src/m/amdahl.h | 3 ++- src/m/amdx86-64.h | 2 +- src/m/apollo.h | 3 ++- src/m/arm.h | 2 +- src/m/att3b.h | 2 +- src/m/aviion.h | 3 ++- src/m/celerity.h | 3 ++- src/m/clipper.h | 3 ++- src/m/cnvrgnt.h | 2 +- src/m/convex.h | 3 ++- src/m/cydra5.h | 3 ++- src/m/delta88k.h | 3 ++- src/m/dpx2.h | 3 ++- src/m/dual.h | 3 ++- src/m/elxsi.h | 3 ++- src/m/ews4800.h | 3 ++- src/m/gould-np1.h | 2 +- src/m/hp800.h | 2 +- src/m/hp9000s300.h | 2 +- src/m/i860.h | 3 ++- src/m/ia64.h | 2 +- src/m/ibm370aix.h | 3 ++- src/m/ibmps2-aix.h | 2 +- src/m/ibmrs6000.h | 2 +- src/m/ibmrt-aix.h | 3 ++- src/m/ibmrt.h | 2 +- src/m/ibms390.h | 3 ++- src/m/intel386.h | 2 +- src/m/iris4d.h | 2 +- src/m/irist.h | 3 ++- src/m/isi-ov.h | 3 ++- src/m/m68k.h | 3 ++- src/m/macppc.h | 3 ++- src/m/masscomp.h | 2 +- src/m/mega68.h | 2 +- src/m/mg1.h | 2 +- src/m/mips-siemens.h | 3 ++- src/m/mips.h | 3 ++- src/m/news.h | 3 ++- src/m/next.h | 2 +- src/m/nh3000.h | 2 +- src/m/nh4000.h | 2 +- src/m/ns16000.h | 2 +- src/m/ns32000.h | 3 ++- src/m/nu.h | 2 +- src/m/orion.h | 2 +- src/m/orion105.h | 2 +- src/m/pfa50.h | 3 ++- src/m/plexus.h | 2 +- src/m/powermac.h | 2 +- src/m/powerpcle.h | 2 +- src/m/pyramid.h | 3 ++- src/m/sequent-ptx.h | 3 ++- src/m/sequent.h | 3 ++- src/m/sparc.h | 2 +- src/m/sps7.h | 3 ++- src/m/sr2k.h | 2 +- src/m/stride.h | 3 ++- src/m/sun1.h | 3 ++- src/m/sun2.h | 3 ++- src/m/sun386.h | 2 +- src/m/symmetry.h | 3 ++- src/m/tad68k.h | 2 +- src/m/tahoe.h | 2 +- src/m/targon31.h | 3 ++- src/m/tek4300.h | 2 +- src/m/tekxd88.h | 2 +- src/m/template.h | 3 ++- src/m/tower32.h | 2 +- src/m/tower32v3.h | 2 +- src/m/ustation.h | 3 ++- src/m/vax.h | 3 ++- src/m/wicat.h | 2 +- src/m/windowsnt.h | 3 ++- src/m/xps100.h | 3 ++- 81 files changed, 123 insertions(+), 81 deletions(-) (limited to 'src') diff --git a/src/m/7300.h b/src/m/7300.h index fa95b3d9c4e..bb261c9188a 100644 --- a/src/m/7300.h +++ b/src/m/7300.h @@ -1,5 +1,5 @@ /* machine description file for AT&T UNIX PC model 7300 - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Modified for this machine by mtxinu!rtech!gonzo!daveb This file is part of GNU Emacs. diff --git a/src/m/acorn.h b/src/m/acorn.h index 66978329d75..399fb7c9249 100644 --- a/src/m/acorn.h +++ b/src/m/acorn.h @@ -1,5 +1,5 @@ /* Machine description file for Acorn RISCiX machines. - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h index cf0afd90bb5..b59322e3d0c 100644 --- a/src/m/alliant-2800.h +++ b/src/m/alliant-2800.h @@ -1,5 +1,5 @@ /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800. - Copyright (C) 1990, 2002 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/alliant.h b/src/m/alliant.h index a32e514271d..cbc5734ab31 100644 --- a/src/m/alliant.h +++ b/src/m/alliant.h @@ -1,5 +1,6 @@ /* alliant.h Alliant machine running system version 2 or 3. - Copyright (C) 1985, 1986, 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Note that for version 1 of the Alliant system you should use alliant1.h instead of this file. Use alliant4.h for version 4. diff --git a/src/m/alpha.h b/src/m/alpha.h index aff6182270f..41fefaf20fd 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -1,5 +1,6 @@ /* machine description file For the alpha chip. - Copyright (C) 1994, 1997, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/altos.h b/src/m/altos.h index e3cf0898773..743752d99ec 100644 --- a/src/m/altos.h +++ b/src/m/altos.h @@ -1,5 +1,6 @@ /* altos machine description file Altos 3068 Unix System V Release 2 - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/amdahl.h b/src/m/amdahl.h index 8b32a2e64d1..89d4b6cb6f7 100644 --- a/src/m/amdahl.h +++ b/src/m/amdahl.h @@ -1,5 +1,6 @@ /* amdahl machine description file - Copyright (C) 1987, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 61b18dcc319..2d7d86ce7c3 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -1,5 +1,5 @@ /* machine description file for AMD x86-64. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/apollo.h b/src/m/apollo.h index 8fa91c004c5..4aa62b0b209 100644 --- a/src/m/apollo.h +++ b/src/m/apollo.h @@ -1,5 +1,6 @@ /* machine description file for Apollo machine. - Copyright (C) 1985, 1986, 1994, 2002, Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/arm.h b/src/m/arm.h index 1ebcf3be4a4..358445e0649 100644 --- a/src/m/arm.h +++ b/src/m/arm.h @@ -1,5 +1,5 @@ /* Machine description file for ARM-based non-RISCiX machines. - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/att3b.h b/src/m/att3b.h index 949e6b1d01b..757b47d3f37 100644 --- a/src/m/att3b.h +++ b/src/m/att3b.h @@ -1,5 +1,5 @@ /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86 diff --git a/src/m/aviion.h b/src/m/aviion.h index 13a262423b0..b9a2932ef07 100644 --- a/src/m/aviion.h +++ b/src/m/aviion.h @@ -1,5 +1,6 @@ /* machine description file for Data General AViiON. - Copyright (C) 1985, 1986, 1991, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/celerity.h b/src/m/celerity.h index 0b0bb020122..639d680afdb 100644 --- a/src/m/celerity.h +++ b/src/m/celerity.h @@ -1,5 +1,6 @@ /* machine description file for Celerity. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/clipper.h b/src/m/clipper.h index 5da09e02fb8..af9f67d8a37 100644 --- a/src/m/clipper.h +++ b/src/m/clipper.h @@ -1,5 +1,6 @@ /* machine description file for clipper - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h index cb344f98f7f..48727bedbe3 100644 --- a/src/m/cnvrgnt.h +++ b/src/m/cnvrgnt.h @@ -1,5 +1,5 @@ /* machine description file for convergent S series. - Copyright (C) 1989, 2002 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/convex.h b/src/m/convex.h index 97b291743dc..b7fcc71b1c3 100644 --- a/src/m/convex.h +++ b/src/m/convex.h @@ -1,5 +1,6 @@ /* machine description file for Convex (all models). - Copyright (C) 1987, 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cydra5.h b/src/m/cydra5.h index e2813dc2a4b..9806fc30a47 100644 --- a/src/m/cydra5.h +++ b/src/m/cydra5.h @@ -1,5 +1,6 @@ /* machine description file for Cydrome's CYDRA 5 mini super computer - Copyright (C) 1988, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/delta88k.h b/src/m/delta88k.h index ab0a48a4e31..517a0f1744b 100644 --- a/src/m/delta88k.h +++ b/src/m/delta88k.h @@ -1,5 +1,6 @@ /* Machine description file for Motorola System V/88 machines - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dpx2.h b/src/m/dpx2.h index 7a24c3940d3..8d1ceb3db06 100644 --- a/src/m/dpx2.h +++ b/src/m/dpx2.h @@ -1,5 +1,6 @@ /* machine description for Bull DPX/2 range - Copyright (C) 1985, 1986, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dual.h b/src/m/dual.h index 253c12bec52..134a5e7720e 100644 --- a/src/m/dual.h +++ b/src/m/dual.h @@ -1,5 +1,6 @@ /* machine description file for Dual machines using unisoft port. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/elxsi.h b/src/m/elxsi.h index f8de3609690..f702dcf0de2 100644 --- a/src/m/elxsi.h +++ b/src/m/elxsi.h @@ -1,5 +1,6 @@ /* machine description file for Elxsi machine (running enix). - Copyright (C) 1986, 1992, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 1992, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Adapted by John Salmon This file is part of GNU Emacs. diff --git a/src/m/ews4800.h b/src/m/ews4800.h index dcb46bf83d8..b377bdeddaa 100644 --- a/src/m/ews4800.h +++ b/src/m/ews4800.h @@ -1,5 +1,6 @@ /* m- file for NEC EWS4800 RISC series. - Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h index 4a267865085..1c784f28f4e 100644 --- a/src/m/gould-np1.h +++ b/src/m/gould-np1.h @@ -1,5 +1,5 @@ /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1) - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp800.h b/src/m/hp800.h index 64243f4be31..2f661989a15 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -1,5 +1,5 @@ /* machine description file for hp9000 series 800 machines. - Copyright (C) 1987, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h index 8886aec204c..e0b3a5ce5c3 100644 --- a/src/m/hp9000s300.h +++ b/src/m/hp9000s300.h @@ -1,5 +1,5 @@ /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD. - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/i860.h b/src/m/i860.h index 66ca2b8fa66..0ecf9e62087 100644 --- a/src/m/i860.h +++ b/src/m/i860.h @@ -1,5 +1,6 @@ /* machine description file for i860. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ia64.h b/src/m/ia64.h index 33d843c773f..af790946afa 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -1,5 +1,5 @@ /* machine description file for the IA-64 architecture. - Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by David Mosberger This file is part of GNU Emacs. diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h index b958656c3e4..3d954ae9d19 100644 --- a/src/m/ibm370aix.h +++ b/src/m/ibm370aix.h @@ -1,5 +1,6 @@ /* m/ file for IBM 370 running AIX. - Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h index d2202d65472..539de924d17 100644 --- a/src/m/ibmps2-aix.h +++ b/src/m/ibmps2-aix.h @@ -1,5 +1,5 @@ /* machine description file for ibm ps/2 aix386. - Copyright (C) 1989, 2002 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index b76d03bc0b7..9559f1ae62a 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -1,5 +1,5 @@ /* R2 AIX machine/system dependent defines - Copyright (C) 1988, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h index b9ea0e6208f..44bfd77c1d0 100644 --- a/src/m/ibmrt-aix.h +++ b/src/m/ibmrt-aix.h @@ -1,5 +1,6 @@ /* RTPC AIX machine/system dependent defines - Copyright (C) 1988, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h index 1388a46b001..f6c23d9d919 100644 --- a/src/m/ibmrt.h +++ b/src/m/ibmrt.h @@ -1,5 +1,5 @@ /* RTPC machine dependent defines - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibms390.h b/src/m/ibms390.h index af7fbb8dfbf..323ef33f633 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -1,5 +1,6 @@ /* machine description file template. - Copyright (C) 1985, 1986, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/intel386.h b/src/m/intel386.h index c63dae7af0b..238015fd345 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -1,5 +1,5 @@ /* Machine description file for intel 386. - Copyright (C) 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/iris4d.h b/src/m/iris4d.h index a13a6f8c2ff..93fe2062674 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -1,5 +1,5 @@ /* machine description file for Iris-4D machines. Use with s/irix*.h. - Copyright (C) 1987, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/irist.h b/src/m/irist.h index 71726977b23..b40ffb5dff9 100644 --- a/src/m/irist.h +++ b/src/m/irist.h @@ -1,6 +1,7 @@ /* machine description file for Silicon Graphics Iris 2500 Turbos; also possibly for non-turbo Irises with system release 2.5. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h index 9b35f03ea70..416335d1bff 100644 --- a/src/m/isi-ov.h +++ b/src/m/isi-ov.h @@ -1,5 +1,6 @@ /* machine description file for ISI 68000's - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/m68k.h b/src/m/m68k.h index 9fdcf1511b8..7b2ffa81351 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h @@ -1,5 +1,6 @@ /* Machine description file for generic Motorola 68k. - Copyright (C) 1985, 1995, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/macppc.h b/src/m/macppc.h index 36022af3e52..9e4297df3b7 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -1,5 +1,6 @@ /* machine description file For the powerpc Macintosh. - Copyright (C) 1994, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/masscomp.h b/src/m/masscomp.h index 4582e29b6bd..01fddc751f1 100644 --- a/src/m/masscomp.h +++ b/src/m/masscomp.h @@ -1,5 +1,5 @@ /* machine description file for Masscomp 5000 series running RTU, ucb universe. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mega68.h b/src/m/mega68.h index ba7ee6b48d4..ef1623ca460 100644 --- a/src/m/mega68.h +++ b/src/m/mega68.h @@ -1,5 +1,5 @@ /* machine description file for Megatest 68000's. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mg1.h b/src/m/mg1.h index 47d34f43768..4e4b3525d6e 100644 --- a/src/m/mg1.h +++ b/src/m/mg1.h @@ -1,5 +1,5 @@ /* machine description file for Whitechapel Computer Works MG1 (ns16000 based). - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. MG-1 version by L.M.McLoughlin This file is part of GNU Emacs. diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h index f00790210c9..fc1a8a2e0d6 100644 --- a/src/m/mips-siemens.h +++ b/src/m/mips-siemens.h @@ -1,5 +1,6 @@ /* m- file for Mips machines. - Copyright (C) 1987,1992,1993,95,2002,03 Free Software Foundation, Inc. + Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file contains some changes for our SVR4 based SINIX-Mips 5.4. I hope this is helpful to port the emacs to our RM?00 series and diff --git a/src/m/mips.h b/src/m/mips.h index e868423642c..28a35e02677 100644 --- a/src/m/mips.h +++ b/src/m/mips.h @@ -1,5 +1,6 @@ /* m- file for Mips machines. - Copyright (C) 1987, 1992, 1999, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/news.h b/src/m/news.h index 1d2585c09a0..dec413c3f9e 100644 --- a/src/m/news.h +++ b/src/m/news.h @@ -1,5 +1,6 @@ /* machine description file for Sony's NEWS workstations, NEWS-OS 3.0. - Copyright (C) 1985, 1986, 1989, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/next.h b/src/m/next.h index 2f2952e10f4..dfb3cd11cbf 100644 --- a/src/m/next.h +++ b/src/m/next.h @@ -1,5 +1,5 @@ /* Configuration file for the NeXT machine. - Copyright (C) 1990, 2002 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh3000.h b/src/m/nh3000.h index 7be5c5dc7db..42255473020 100644 --- a/src/m/nh3000.h +++ b/src/m/nh3000.h @@ -1,7 +1,7 @@ /* machine description for Harris Night Hawk Series 1200 and Series 3000 MC68030-based systems (FPP on these is custom). These systems are also known as "ecx" and "gcx". - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh4000.h b/src/m/nh4000.h index 3d8794b2802..04068f0c065 100644 --- a/src/m/nh4000.h +++ b/src/m/nh4000.h @@ -1,6 +1,6 @@ /* machine description for Harris NightHawk 88k based machines (includes nh4000 and nh5000 machines). - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns16000.h b/src/m/ns16000.h index 07fff86502b..49f514ced06 100644 --- a/src/m/ns16000.h +++ b/src/m/ns16000.h @@ -1,5 +1,5 @@ /* machine description file for ns16000. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns32000.h b/src/m/ns32000.h index 9a135fe2d9f..858630b74ab 100644 --- a/src/m/ns32000.h +++ b/src/m/ns32000.h @@ -1,5 +1,6 @@ /* machine description file for National Semiconductor 32000, running Genix. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nu.h b/src/m/nu.h index 8ca03155314..1e5518e451f 100644 --- a/src/m/nu.h +++ b/src/m/nu.h @@ -1,5 +1,5 @@ /* machine description file for TI Nu machines using system V. - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion.h b/src/m/orion.h index e4fa8529664..a73b357d50f 100644 --- a/src/m/orion.h +++ b/src/m/orion.h @@ -1,5 +1,5 @@ /* machine description file for HLH Orion. - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion105.h b/src/m/orion105.h index d0adaba70ec..e75a8e67a84 100644 --- a/src/m/orion105.h +++ b/src/m/orion105.h @@ -1,5 +1,5 @@ /* machine description file for HLH Orion 1/05 (Clipper). - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Lee McLoughlin This file is part of GNU Emacs. diff --git a/src/m/pfa50.h b/src/m/pfa50.h index be430d25fdc..50e79b623ca 100644 --- a/src/m/pfa50.h +++ b/src/m/pfa50.h @@ -1,5 +1,6 @@ /* Machine description file for PFU A-series. - Copyright (C) 1988, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/plexus.h b/src/m/plexus.h index a2f6cc545a0..10826a70bc2 100644 --- a/src/m/plexus.h +++ b/src/m/plexus.h @@ -1,5 +1,5 @@ /* machine description file for the Plexus running System V.2. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powermac.h b/src/m/powermac.h index c41003ae61c..14b2e110734 100644 --- a/src/m/powermac.h +++ b/src/m/powermac.h @@ -1,5 +1,5 @@ /* Machine description file for Apple Power Macintosh - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h index 34096a37d18..1dfd2df25b4 100644 --- a/src/m/powerpcle.h +++ b/src/m/powerpcle.h @@ -1,5 +1,5 @@ /* machine description file for PowerPC. - Copyright (C) 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/pyramid.h b/src/m/pyramid.h index 7e0db61ec59..12010087a58 100644 --- a/src/m/pyramid.h +++ b/src/m/pyramid.h @@ -1,5 +1,6 @@ /* machine description file for pyramid. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h index 57d255a861e..3c22639e3b2 100644 --- a/src/m/sequent-ptx.h +++ b/src/m/sequent-ptx.h @@ -1,5 +1,6 @@ /* machine description file for SEQUENT machines running DYNIX/ptx - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sequent.h b/src/m/sequent.h index 7c572f54f68..f082880b4fc 100644 --- a/src/m/sequent.h +++ b/src/m/sequent.h @@ -1,5 +1,6 @@ /* machine description file for SEQUENT BALANCE machines - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sparc.h b/src/m/sparc.h index 6926aced07b..20ec53c1344 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -1,5 +1,5 @@ /* machine description file for Sun 4 SPARC. - Copyright (C) 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sps7.h b/src/m/sps7.h index 3bd0c94bccd..422d2470aaa 100644 --- a/src/m/sps7.h +++ b/src/m/sps7.h @@ -1,5 +1,6 @@ /* machine description file for Bull SPS-7. - Copyright (C) 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sr2k.h b/src/m/sr2k.h index 83dbf4941ff..875f428dc1f 100644 --- a/src/m/sr2k.h +++ b/src/m/sr2k.h @@ -1,5 +1,5 @@ /* machine description file for Hitachi SR2001/SR2201 machines. - Copyright (C) 1996, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/stride.h b/src/m/stride.h index f176a7642a7..ff900d49b38 100644 --- a/src/m/stride.h +++ b/src/m/stride.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun1.h b/src/m/sun1.h index 7ab81218705..810bad7fd58 100644 --- a/src/m/sun1.h +++ b/src/m/sun1.h @@ -1,5 +1,6 @@ /* machine description file for Sun 68000's - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun2.h b/src/m/sun2.h index 452fdfc7c01..9df032049e3 100644 --- a/src/m/sun2.h +++ b/src/m/sun2.h @@ -1,7 +1,8 @@ /* machine description file for Sun 68000's OPERATING SYSTEM version 2. Note that "sun2.h" refers to the operating system version, not the CPU model number. See the MACHINES file for details. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun386.h b/src/m/sun386.h index 782e10925ef..5970f90b98b 100644 --- a/src/m/sun386.h +++ b/src/m/sun386.h @@ -2,7 +2,7 @@ "sun2.h", but since that file is heavily cpu-specific, it was easier not to include it. - Copyright (C) 1988 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/symmetry.h b/src/m/symmetry.h index 262d6474757..4954f596442 100644 --- a/src/m/symmetry.h +++ b/src/m/symmetry.h @@ -1,5 +1,6 @@ /* machine description file for SEQUENT SYMMETRY machines - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tad68k.h b/src/m/tad68k.h index 4c904aaf569..b8b3859f407 100644 --- a/src/m/tad68k.h +++ b/src/m/tad68k.h @@ -1,5 +1,5 @@ /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tahoe.h b/src/m/tahoe.h index 988624839b4..47db3f93deb 100644 --- a/src/m/tahoe.h +++ b/src/m/tahoe.h @@ -1,5 +1,5 @@ /* machine description file for tahoe. - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/targon31.h b/src/m/targon31.h index 08ecb681bd9..5ac18648387 100644 --- a/src/m/targon31.h +++ b/src/m/targon31.h @@ -1,5 +1,6 @@ /* targon31 machine description file - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tek4300.h b/src/m/tek4300.h index 164df72210a..a84135291cb 100644 --- a/src/m/tek4300.h +++ b/src/m/tek4300.h @@ -1,5 +1,5 @@ /* machine description file for tek4300. - Copyright (C) 1988, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h index 7af3dab6a07..4db981a8096 100644 --- a/src/m/tekxd88.h +++ b/src/m/tekxd88.h @@ -1,7 +1,7 @@ /* Configuration file for the Tektronix XD88 running UTekV 3.2e, contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 1/15/93. You probably need to use gnu make (version 3.63 or higher.) - Copyright (C) 1993, 2002 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/template.h b/src/m/template.h index c088efff81a..c7ce2c2cb1f 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -1,5 +1,6 @@ /* machine description file template. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32.h b/src/m/tower32.h index c5f34d065ea..cd4ab96de11 100644 --- a/src/m/tower32.h +++ b/src/m/tower32.h @@ -1,5 +1,5 @@ /* machine description file for the NCR Tower 32 running System V.2. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h index 927dfca93d9..2c1e55c0023 100644 --- a/src/m/tower32v3.h +++ b/src/m/tower32v3.h @@ -1,5 +1,5 @@ /* machine description file for the NCR Tower 32 running System V.3. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ustation.h b/src/m/ustation.h index e7068f3cd86..c62d37d6429 100644 --- a/src/m/ustation.h +++ b/src/m/ustation.h @@ -1,5 +1,6 @@ /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30). - Copyright (C) 1986, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/vax.h b/src/m/vax.h index 22fda95abc5..d414d6b57e7 100644 --- a/src/m/vax.h +++ b/src/m/vax.h @@ -1,5 +1,6 @@ /* machine description file for vax. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/wicat.h b/src/m/wicat.h index bd8fcefe99c..78842f32a43 100644 --- a/src/m/wicat.h +++ b/src/m/wicat.h @@ -1,5 +1,5 @@ /* machine description file for WICAT machines. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h index 39c7baa9de6..cf48ca8aa88 100644 --- a/src/m/windowsnt.h +++ b/src/m/windowsnt.h @@ -1,6 +1,7 @@ /* Machine description file for Windows NT. - Copyright (C) 1993, 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/xps100.h b/src/m/xps100.h index c6e54710bd6..3a851aa9ebd 100644 --- a/src/m/xps100.h +++ b/src/m/xps100.h @@ -1,7 +1,8 @@ /* xps100.h for the Honeywell XPS100 running UNIX System V.2 Mark J. Hewitt (mjh@uk.co.kernel) - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. -- cgit v1.2.1 From 92b47a4a991a7b30f5eda49fcab4f29aa9ca288e Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 10:56:27 +0000 Subject: Update years in copyright notice; nfc. --- src/s/aix3-1.h | 3 ++- src/s/bsd4-1.h | 3 ++- src/s/bsd4-2.h | 3 ++- src/s/bsd4-3.h | 3 ++- src/s/cxux.h | 2 +- src/s/cygwin.h | 3 ++- src/s/darwin.h | 2 +- src/s/dgux.h | 3 ++- src/s/dgux4.h | 2 +- src/s/dgux5-4-3.h | 2 +- src/s/dgux5-4r2.h | 2 +- src/s/freebsd.h | 4 ++-- src/s/gnu-linux.h | 3 ++- src/s/gnu.h | 3 ++- src/s/hpux.h | 3 ++- src/s/iris3-5.h | 3 ++- src/s/iris3-6.h | 3 ++- src/s/irix3-3.h | 3 ++- src/s/lynxos.h | 3 ++- src/s/ms-w32.h | 3 ++- src/s/msdos.h | 3 ++- src/s/newsos5.h | 3 ++- src/s/nextstep.h | 3 ++- src/s/ptx.h | 3 ++- src/s/riscix1-1.h | 2 +- src/s/riscix12.h | 2 +- src/s/rtu.h | 3 ++- src/s/sco4.h | 3 ++- src/s/sco5.h | 2 +- src/s/template.h | 3 ++- src/s/umax.h | 3 ++- src/s/unipl5-2.h | 3 ++- src/s/usg5-0.h | 3 ++- src/s/usg5-2-2.h | 3 ++- src/s/usg5-2.h | 3 ++- src/s/usg5-3.h | 3 ++- src/s/usg5-4.h | 3 ++- src/s/vms.h | 2 +- src/s/xenix.h | 3 ++- 39 files changed, 69 insertions(+), 40 deletions(-) (limited to 'src') diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h index 8fe7bd8fa24..eedfe3d15be 100644 --- a/src/s/aix3-1.h +++ b/src/s/aix3-1.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on IBM AIX version 3.1 - Copyright (C) 1985, 1986, 1990, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h index 7316841e212..f36bc016ca8 100644 --- a/src/s/bsd4-1.h +++ b/src/s/bsd4-1.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.1. - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h index 386ab1bbbe5..f4e60b0fdbd 100644 --- a/src/s/bsd4-2.h +++ b/src/s/bsd4-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.2 - Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h index bbb2715bdf7..37d6a63e984 100644 --- a/src/s/bsd4-3.h +++ b/src/s/bsd4-3.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.3 - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cxux.h b/src/s/cxux.h index 2af6d006095..118d93d579c 100644 --- a/src/s/cxux.h +++ b/src/s/cxux.h @@ -1,5 +1,5 @@ /* Header file for Harris CXUX. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cygwin.h b/src/s/cygwin.h index ac977b8cb52..921cff35bc7 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -1,7 +1,8 @@ /* Template for system description header files. This file describes the parameters that system description files should define or not. - Copyright (C) 1985, 1986, 1992, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/darwin.h b/src/s/darwin.h index fea5b4c282d..fad445d7557 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -1,5 +1,5 @@ /* System description header file for Darwin (Mac OS X). - Copyright (C) 2001, 02, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux.h b/src/s/dgux.h index fb01b539f27..82956a900d9 100644 --- a/src/s/dgux.h +++ b/src/s/dgux.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX version 4.32 upto and including 5.4.1. - Copyright (C) 1994, 1999 Free Software Foundation, Inc. + Copyright (C) 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux4.h b/src/s/dgux4.h index d866d63e6ce..35834ad4da2 100644 --- a/src/s/dgux4.h +++ b/src/s/dgux4.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX Release 4.10 and above. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h index a95420595a1..7ec88a435eb 100644 --- a/src/s/dgux5-4-3.h +++ b/src/s/dgux5-4-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX version 5.4 Release 3.00 and above. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h index c2c7461a204..3f059c32c24 100644 --- a/src/s/dgux5-4r2.h +++ b/src/s/dgux5-4r2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX 5.4 Release 2.xx systems. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/freebsd.h b/src/s/freebsd.h index dc26eb9f399..83949fd2819 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -1,8 +1,8 @@ /* System description header for FreeBSD systems. This file describes the parameters that system description files should define or not. - Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 2563496af5c..f87dcaded1b 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -1,5 +1,6 @@ /* This file is the configuration file for Linux-based GNU systems - Copyright (C) 1985, 86, 92, 94, 96, 1999, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/gnu.h b/src/s/gnu.h index 79e5a88a7b9..0da816c32d3 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on the GNU Hurd. - Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/hpux.h b/src/s/hpux.h index 665b1f3063d..30ade71bf20 100644 --- a/src/s/hpux.h +++ b/src/s/hpux.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on HPUX release 7.0. Based on AT&T System V.2. - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h index 8815bb56f39..a3b6c8ad0ad 100644 --- a/src/s/iris3-5.h +++ b/src/s/iris3-5.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics 3.5 - Copyright (C) 1987, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h index 64187428c29..1d8b96cc23f 100644 --- a/src/s/iris3-6.h +++ b/src/s/iris3-6.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6. - Copyright (C) 1987, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h index 60dd6d49c79..a613779913a 100644 --- a/src/s/irix3-3.h +++ b/src/s/irix3-3.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3. - Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/lynxos.h b/src/s/lynxos.h index 55de8cba6f9..614735d290d 100644 --- a/src/s/lynxos.h +++ b/src/s/lynxos.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on LynxOS-3.0.1 - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index c4697db34db..b1989318fba 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -1,5 +1,6 @@ /* System description file for Windows NT. - Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/msdos.h b/src/s/msdos.h index 5a0cbba5959..9469b33227f 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -1,6 +1,7 @@ /* System description file for MS-DOS - Copyright (C) 1993, 1996, 1997, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/newsos5.h b/src/s/newsos5.h index c674bfc559d..d2bed2189be 100644 --- a/src/s/newsos5.h +++ b/src/s/newsos5.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2 - Copyright (C) 1992, 1994 Free Software Foundation, Inc. + Copyright (C) 1992, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/nextstep.h b/src/s/nextstep.h index 9253e6acffc..0c0b01c10bd 100644 --- a/src/s/nextstep.h +++ b/src/s/nextstep.h @@ -1,5 +1,6 @@ /* Configuration file for the NeXTstep system. - Copyright (C) 1990, 1995 Free Software Foundation, Inc. + Copyright (C) 1990, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/ptx.h b/src/s/ptx.h index e490ba659a2..1411dee70d8 100644 --- a/src/s/ptx.h +++ b/src/s/ptx.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x - Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h index ccfa5704b85..aee5d6ddc58 100644 --- a/src/s/riscix1-1.h +++ b/src/s/riscix1-1.h @@ -1,5 +1,5 @@ /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3) - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/riscix12.h b/src/s/riscix12.h index b0e00e780cc..625b667d7b5 100644 --- a/src/s/riscix12.h +++ b/src/s/riscix12.h @@ -1,5 +1,5 @@ /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3) - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/rtu.h b/src/s/rtu.h index 92afbaf6328..b2d0c16e59a 100644 --- a/src/s/rtu.h +++ b/src/s/rtu.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe. - Copyright (C) 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco4.h b/src/s/sco4.h index 757eb0b57b0..627007e9a52 100644 --- a/src/s/sco4.h +++ b/src/s/sco4.h @@ -1,5 +1,6 @@ /* System description file for SCO 3.2v4. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco5.h b/src/s/sco5.h index e490a91b608..9fbbf072a12 100644 --- a/src/s/sco5.h +++ b/src/s/sco5.h @@ -1,5 +1,5 @@ /* System description file for SCO 3.2v5. - Copyright (C) 1996, 2002 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/template.h b/src/s/template.h index 5ef1049164d..0610e16473a 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -1,7 +1,8 @@ /* Template for system description header files. This file describes the parameters that system description files should define or not. - Copyright (C) 1985, 1986, 1992, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/umax.h b/src/s/umax.h index 1741b1d04e3..f4923f33053 100644 --- a/src/s/umax.h +++ b/src/s/umax.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on UMAX 4.2 - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h index 05d162239a8..cca703adb82 100644 --- a/src/s/unipl5-2.h +++ b/src/s/unipl5-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h index 21b469dcd55..5f9943f8477 100644 --- a/src/s/usg5-0.h +++ b/src/s/usg5-0.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V.0 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h index dff90efb225..b090f3c32b6 100644 --- a/src/s/usg5-2-2.h +++ b/src/s/usg5-2-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h index 0da477276fd..e63bddfc060 100644 --- a/src/s/usg5-2.h +++ b/src/s/usg5-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h index 285bae670df..12259936928 100644 --- a/src/s/usg5-3.h +++ b/src/s/usg5-3.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 3 - Copyright (C) 1987, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 4edda95b39c..b8c2f8d9fa2 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 4 - Copyright (C) 1987, 1990, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/vms.h b/src/s/vms.h index 9afd69b8539..e3c9dc725c0 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -1,5 +1,5 @@ /* system description header for VMS - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/xenix.h b/src/s/xenix.h index 763a10956ff..e67b897faff 100644 --- a/src/s/xenix.h +++ b/src/s/xenix.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2 - Copyright (C) 1988, 1999 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. -- cgit v1.2.1 From 0b5538bd8587cfa6a9c90ff7d0c4699654dbabc6 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 12:33:19 +0000 Subject: Update years in copyright notice; nfc. --- src/Makefile.in | 4 ++-- src/abbrev.c | 4 ++-- src/atimer.c | 2 +- src/atimer.h | 2 +- src/blockinput.h | 3 ++- src/buffer.c | 5 +++-- src/buffer.h | 2 +- src/bytecode.c | 4 ++-- src/callint.c | 4 ++-- src/callproc.c | 2 +- src/casefiddle.c | 4 ++-- src/casetab.c | 3 ++- src/ccl.c | 2 +- src/charset.c | 2 +- src/charset.h | 2 +- src/cm.c | 3 ++- src/cm.h | 3 ++- src/cmds.c | 4 ++-- src/coding.c | 2 +- src/coding.h | 2 +- src/commands.h | 3 ++- src/composite.c | 2 +- src/composite.h | 2 +- src/cxux-crt0.s | 2 +- src/data.c | 4 ++-- src/dired.c | 4 ++-- src/dispextern.h | 4 ++-- src/dispnew.c | 5 +++-- src/disptab.h | 2 +- src/doc.c | 4 ++-- src/doprnt.c | 2 +- src/dosfns.c | 4 ++-- src/dosfns.h | 4 ++-- src/ecrt0.c | 3 ++- src/editfns.c | 5 +++-- src/emacs.c | 4 ++-- src/epaths.in | 4 ++-- src/eval.c | 2 +- src/fileio.c | 5 +++-- src/filelock.c | 4 ++-- src/filemode.c | 3 ++- src/firstfile.c | 2 +- src/floatfns.c | 3 ++- src/fns.c | 5 +++-- src/fontset.c | 2 +- src/fontset.h | 1 + src/frame.c | 4 ++-- src/frame.h | 3 ++- src/fringe.c | 5 +++-- src/getloadavg.c | 4 ++-- src/getpagesize.h | 3 ++- src/gmalloc.c | 3 ++- src/gtkutil.c | 3 +-- src/gtkutil.h | 3 +-- src/image.c | 4 ++-- src/indent.c | 2 +- src/indent.h | 3 ++- src/insdel.c | 4 ++-- src/intervals.c | 3 ++- src/intervals.h | 3 ++- src/keyboard.c | 5 +++-- src/keyboard.h | 3 ++- src/keymap.c | 5 +++-- src/keymap.h | 2 +- src/lastfile.c | 2 +- src/lisp.h | 2 +- src/lread.c | 5 +++-- src/mac.c | 3 ++- src/macfns.c | 2 +- src/macgui.h | 3 ++- src/macmenu.c | 3 ++- src/macros.c | 3 ++- src/macros.h | 2 +- src/macterm.c | 3 ++- src/macterm.h | 3 ++- src/makefile.w32-in | 3 ++- src/marker.c | 3 ++- src/md5.c | 3 ++- src/md5.h | 3 ++- src/mem-limits.h | 3 ++- src/minibuf.c | 4 ++-- src/mktime.c | 3 ++- src/msdos.c | 4 ++-- src/msdos.h | 3 ++- src/prefix-args.c | 2 +- src/print.c | 5 +++-- src/process.c | 5 +++-- src/process.h | 3 ++- src/puresize.h | 2 +- src/ralloc.c | 3 ++- src/regex.c | 3 ++- src/regex.h | 3 ++- src/region-cache.c | 4 ++-- src/region-cache.h | 3 ++- src/scroll.c | 3 ++- src/search.c | 4 ++-- src/sheap.c | 3 +-- src/sound.c | 3 ++- src/strftime.c | 4 ++-- src/sunfns.c | 3 ++- src/syntax.c | 3 ++- src/syntax.h | 3 ++- src/sysdep.c | 2 +- src/sysselect.h | 2 +- src/syssignal.h | 3 ++- src/systime.h | 3 ++- src/systty.h | 3 ++- src/syswait.h | 3 ++- src/term.c | 4 ++-- src/termcap.c | 4 ++-- src/termchar.h | 3 ++- src/termhooks.h | 3 ++- src/terminfo.c | 3 ++- src/termopts.h | 3 ++- src/textprop.c | 4 ++-- src/tparam.c | 3 ++- src/uaf.h | 2 +- src/undo.c | 4 ++-- src/unexaix.c | 3 ++- src/unexalpha.c | 3 ++- src/unexapollo.c | 3 ++- src/unexconvex.c | 3 ++- src/unexcw.c | 3 +-- src/unexec.c | 3 ++- src/unexelf.c | 4 ++-- src/unexenix.c | 3 ++- src/unexmacosx.c | 2 +- src/unexmips.c | 3 ++- src/unexnext.c | 3 ++- src/unexsni.c | 4 ++-- src/unexsunos4.c | 3 ++- src/unexw32.c | 2 +- src/vm-limit.c | 3 ++- src/w16select.c | 3 ++- src/w32.c | 3 ++- src/w32.h | 2 +- src/w32bdf.c | 2 +- src/w32bdf.h | 2 +- src/w32console.c | 3 ++- src/w32fns.c | 4 ++-- src/w32gui.h | 2 +- src/w32heap.c | 2 +- src/w32heap.h | 2 +- src/w32inevt.c | 3 ++- src/w32inevt.h | 2 +- src/w32menu.c | 3 ++- src/w32proc.c | 3 ++- src/w32reg.c | 3 ++- src/w32select.c | 3 ++- src/w32term.c | 4 ++-- src/w32term.h | 3 ++- src/w32xfns.c | 3 ++- src/widget.c | 3 ++- src/widget.h | 2 +- src/widgetprv.h | 2 +- src/window.c | 2 +- src/window.h | 4 ++-- src/xdisp.c | 5 +++-- src/xfaces.c | 4 ++-- src/xfns.c | 2 +- src/xmenu.c | 4 ++-- src/xrdb.c | 3 ++- src/xselect.c | 4 ++-- src/xsmfns.c | 2 +- src/xterm.c | 2 +- src/xterm.h | 4 ++-- 166 files changed, 296 insertions(+), 218 deletions(-) (limited to 'src') diff --git a/src/Makefile.in b/src/Makefile.in index 88b71d4d1e2..d9c77bf00b5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ # Makefile for GNU Emacs. -# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 01, 03, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/src/abbrev.c b/src/abbrev.c index 8cb87f2c884..84054892910 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -1,6 +1,6 @@ /* Primitives for word-abbrev mode. - Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001,02,03,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.c b/src/atimer.c index 9ac6d529b99..f8ed1b265ec 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.h b/src/atimer.h index 5057eb2be24..d5ad9c674d5 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/blockinput.h b/src/blockinput.h index 36559715533..0eaebbe34df 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -1,5 +1,6 @@ /* blockinput.h - interface to blocking complicated interrupt-driven input. - Copyright (C) 1989, 1993, 2004 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.c b/src/buffer.c index 7b306b103df..30626f11a24 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,6 +1,7 @@ /* Buffer manipulation primitives for GNU Emacs. - Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, - 2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, + 1995, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.h b/src/buffer.h index 5ea889dfe6d..2387af65a47 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,6 +1,6 @@ /* Header file for the buffer manipulation primitives. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/bytecode.c b/src/bytecode.c index 3069e0a6ac3..918ebdd550b 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1,6 +1,6 @@ /* Execution of byte code produced by bytecomp.el. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callint.c b/src/callint.c index 10db39ddce4..5979e495ac3 100644 --- a/src/callint.c +++ b/src/callint.c @@ -1,6 +1,6 @@ /* Call a Lisp function interactively. - Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 02, 03, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callproc.c b/src/callproc.c index b78fae1d075..47930819c07 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,6 +1,6 @@ /* Synchronous subprocess invocation for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casefiddle.c b/src/casefiddle.c index b063ef7510a..454d184b99b 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -1,6 +1,6 @@ /* GNU Emacs case conversion functions. - Copyright (C) 1985,94,97,98,99, 2001, 2002, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casetab.c b/src/casetab.c index 448a236f565..874bb7599f0 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -1,5 +1,6 @@ /* GNU Emacs routines to deal with case tables. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ccl.c b/src/ccl.c index 9fb097d55df..562215218bc 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1,7 +1,7 @@ /* CCL (Code Conversion Language) interpreter. Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. Licensed to the Free Software Foundation. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/charset.c b/src/charset.c index e7b6897ea98..3676c9b8a71 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1,7 +1,7 @@ /* Basic multilingual character support. Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/charset.h b/src/charset.h index 43791baf0c5..a5cdca21bbb 100644 --- a/src/charset.h +++ b/src/charset.h @@ -1,7 +1,7 @@ /* Header for multibyte character handler. Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cm.c b/src/cm.c index 41567be2018..354097b39e4 100644 --- a/src/cm.c +++ b/src/cm.c @@ -1,5 +1,6 @@ /* Cursor motion subroutines for GNU Emacs. - Copyright (C) 1985, 1995 Free Software Foundation, Inc. + Copyright (C) 1985, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. based primarily on public domain code written by Chris Torek This file is part of GNU Emacs. diff --git a/src/cm.h b/src/cm.h index 5f806993346..a2ae6116e5d 100644 --- a/src/cm.h +++ b/src/cm.h @@ -1,5 +1,6 @@ /* Cursor motion calculation definitions for GNU Emacs - Copyright (C) 1985, 1989 Free Software Foundation, Inc. + Copyright (C) 1985, 1989, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cmds.c b/src/cmds.c index 7940f3cf216..cc5bd90cca7 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -1,6 +1,6 @@ /* Simple built-in editing commands. - Copyright (C) 1985, 93, 94, 95, 96, 97, 1998, 2001, 02, 03 - Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/coding.c b/src/coding.c index a4f03c70d96..794f49495fb 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1,7 +1,7 @@ /* Coding system handler (conversion, detection, and etc). Copyright (C) 1995,97,1998,2002,2003 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001,2002,2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/coding.h b/src/coding.h index b9ea4597005..1ea1dafd54b 100644 --- a/src/coding.h +++ b/src/coding.h @@ -1,7 +1,7 @@ /* Header for coding system handler. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/commands.h b/src/commands.h index 9486467e2fe..7ad593577ad 100644 --- a/src/commands.h +++ b/src/commands.h @@ -1,5 +1,6 @@ /* Definitions needed by most editing commands. - Copyright (C) 1985, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/composite.c b/src/composite.c index fecbe8020f6..daa6dceb3c6 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1,7 +1,7 @@ /* Composite sequence support. Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/composite.h b/src/composite.h index 9dfe597631e..26cf13d27d4 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,7 +1,7 @@ /* Header for composite sequence handler. Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s index 615837eaeb4..71076eb8b5f 100644 --- a/src/cxux-crt0.s +++ b/src/cxux-crt0.s @@ -1,6 +1,6 @@ /* * External symbol setup file for GNU Emacs on CX/UX - * Copyright (C) 1990 Free Software Foundation, Inc. + * Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. * * This file is part of GNU Emacs. * diff --git a/src/data.c b/src/data.c index 5fcfc66e59e..c0c797da266 100644 --- a/src/data.c +++ b/src/data.c @@ -1,6 +1,6 @@ /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. - Copyright (C) 1985,86,88,93,94,95,97,98,99, 2000, 2001, 03, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dired.c b/src/dired.c index 55f96d28888..edf666d2a5f 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1,6 +1,6 @@ /* Lisp functions for making directory listings. - Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispextern.h b/src/dispextern.h index af599792c63..d6537bcd67a 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1,6 +1,6 @@ /* Interface definitions for display code. - Copyright (C) 1985,93,94,97,98,99, 2000,01,02,03, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispnew.c b/src/dispnew.c index 6d0faf14f76..642573b652c 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1,6 +1,7 @@ /* Updating of data structures for redisplay. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/disptab.h b/src/disptab.h index 30b2a7a7486..41f4bcbfdbf 100644 --- a/src/disptab.h +++ b/src/disptab.h @@ -1,5 +1,5 @@ /* Things for GLYPHS and glyph tables. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/doc.c b/src/doc.c index 6d8b625affe..6d54aeceacd 100644 --- a/src/doc.c +++ b/src/doc.c @@ -1,6 +1,6 @@ /* Record indices of function doc strings stored in a file. - Copyright (C) 1985, 86,93,94,95,97,98,99,2000,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/doprnt.c b/src/doprnt.c index 1cfc5aecee6..5d824038faf 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -1,7 +1,7 @@ /* Output like sprintf to a buffer of specified size. Also takes args differently: pass one pointer to an array of strings in addition to the format string which is separate. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.c b/src/dosfns.c index 6192836e970..c256595cc13 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -1,7 +1,7 @@ /* MS-DOS specific Lisp utilities. Coded by Manabu Higashida, 1991. Major changes May-July 1993 Morten Welinder (only 10% original code left) - Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001 - Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.h b/src/dosfns.h index 594c3d980c6..40aaf524e23 100644 --- a/src/dosfns.h +++ b/src/dosfns.h @@ -2,8 +2,8 @@ Coded by Manabu Higashida, 1991. Modified by Morten Welinder, 1993-1994. - Copyright (C) 1991, 1994, 1995, 1997, 1999 - Free Software Foundation, Inc. + Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ecrt0.c b/src/ecrt0.c index 95b69b11c01..5ee24dfae8c 100644 --- a/src/ecrt0.c +++ b/src/ecrt0.c @@ -1,5 +1,6 @@ /* C code startup routine. - Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/editfns.c b/src/editfns.c index 05888fd4843..da4533d2537 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1,6 +1,7 @@ /* Lisp functions pertaining to editing. - Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/emacs.c b/src/emacs.c index ae9eb4decb7..87aee828420 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1,6 +1,6 @@ /* Fully extensible Emacs, running on Unix, intended for GNU. - Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/epaths.in b/src/epaths.in index be91cb485ae..ee965cb7615 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -1,6 +1,6 @@ /* Hey Emacs, this is -*- C -*- code! */ -/* Copyright (C) 1993, 1995, 1997, 1999, 2001 - Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/eval.c b/src/eval.c index 56fe670f1b1..a867d00150e 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1,6 +1,6 @@ /* Evaluator for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fileio.c b/src/fileio.c index d09b4789639..53ae967e285 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,6 +1,7 @@ /* File IO for GNU Emacs. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filelock.c b/src/filelock.c index de348f61a90..fc6839f5f88 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -1,6 +1,6 @@ /* Lock files for editing. - Copyright (C) 1985, 86, 87, 93, 94, 96, 98, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filemode.c b/src/filemode.c index 130cbace773..6257c6a7664 100644 --- a/src/filemode.c +++ b/src/filemode.c @@ -1,5 +1,6 @@ /* filemode.c -- make a string describing file modes - Copyright (C) 1985, 1990, 1993 Free Software Foundation, Inc. + Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/firstfile.c b/src/firstfile.c index cf6dbf3e888..b16f3a3dc44 100644 --- a/src/firstfile.c +++ b/src/firstfile.c @@ -1,5 +1,5 @@ /* Mark beginning of data space to dump as pure, for GNU Emacs. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/floatfns.c b/src/floatfns.c index 0f91b80370a..79574e0a69b 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -1,5 +1,6 @@ /* Primitive operations on floating point for GNU Emacs Lisp interpreter. - Copyright (C) 1988, 1993, 1994, 1999, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fns.c b/src/fns.c index aefc61b7d94..60a98fd5709 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,6 +1,7 @@ /* Random utility Lisp functions. - Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fontset.c b/src/fontset.c index 27295715eaf..130ab402cc7 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1,7 +1,7 @@ /* Fontset handler. - Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fontset.h b/src/fontset.h index 7d2def16cfc..3a4932af6c0 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -1,6 +1,7 @@ /* Header for fontset handler. Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/frame.c b/src/frame.c index 84920a97b8c..d423138fc9a 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,6 +1,6 @@ /* Generic frame functions. - Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003, 2004, 2005 - Free Software Foundation. + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/frame.h b/src/frame.h index a2f5fc2fde5..b6da35ed23a 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1,5 +1,6 @@ /* Define frame-object for GNU Emacs. - Copyright (C) 1993, 1994, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fringe.c b/src/fringe.c index 082aabc37a1..f9120d4c74b 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1,6 +1,7 @@ /* Fringe handling (split from xdisp.c). - Copyright (C) 1985,86,87,88,93,94,95,97,98,99,2000,01,02,03,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, + 1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/getloadavg.c b/src/getloadavg.c index 191f7d4244f..a2ae9bc310b 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c @@ -1,6 +1,6 @@ /* Get the system load averages. - Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995, 1997, 2003 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995, + 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. diff --git a/src/getpagesize.h b/src/getpagesize.h index 20f19279cd0..ed47f80b0e0 100644 --- a/src/getpagesize.h +++ b/src/getpagesize.h @@ -1,5 +1,6 @@ /* Emulate getpagesize on systems that lack it. - Copyright (C) 1986, 1992, 1995, 2001 Free Software Foundation, Inc. + Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gmalloc.c b/src/gmalloc.c index 08de77df0e0..55aedb7801b 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -5,7 +5,8 @@ /* The malloc headers and source files from the C library follow here. */ /* Declarations for `malloc' and friends. - Copyright 1990, 91, 92, 93, 95, 96, 99 Free Software Foundation, Inc. + Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Written May 1989 by Mike Haertel. This library is free software; you can redistribute it and/or diff --git a/src/gtkutil.c b/src/gtkutil.c index 1cb1004f576..d8835c2b5fd 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1,6 +1,5 @@ /* Functions for creating and updating GTK widgets. - Copyright (C) 2003 - Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gtkutil.h b/src/gtkutil.h index 08ba9ee1314..48060533a57 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -1,6 +1,5 @@ /* Definitions and headers for GTK widgets. - Copyright (C) 2003 - Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/image.c b/src/image.c index 928ec0437aa..98190d3381c 100644 --- a/src/image.c +++ b/src/image.c @@ -1,6 +1,6 @@ /* Functions for image support on window system. - Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04 - Free Software Foundation. + Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.c b/src/indent.c index 3864057472c..8809c563186 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1,6 +1,6 @@ /* Indentation functions. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.h b/src/indent.h index 39db7b8cf5f..6026be827e8 100644 --- a/src/indent.h +++ b/src/indent.h @@ -1,5 +1,6 @@ /* Definitions for interface to indent.c - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/insdel.c b/src/insdel.c index 49ff949ca4a..fd416037241 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1,6 +1,6 @@ /* Buffer insertion/deletion and gap motion for GNU Emacs. - Copyright (C) 1985, 86,93,94,95,97,98, 1999, 2000, 01, 2003, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.c b/src/intervals.c index cb60061fdce..e9d87a10b78 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1,5 +1,6 @@ /* Code for doing intervals. - Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.h b/src/intervals.h index 0d3e50ff694..3dc06d2333e 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -1,5 +1,6 @@ /* Definitions and global variables for intervals. - Copyright (C) 1993, 1994, 2000, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.c b/src/keyboard.c index 194e52d2700..e9a51bbeeb4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1,6 +1,7 @@ /* Keyboard and mouse input; editor command loop. - Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, + 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.h b/src/keyboard.h index f5be3f28cf4..afda1c00a92 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -1,5 +1,6 @@ /* Declarations useful when processing input. - Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.c b/src/keymap.c index 49151a395fb..9a3d9f288f2 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1,6 +1,7 @@ /* Manipulation of keymaps - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000, - 2001, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.h b/src/keymap.h index 4fcbffbed5a..bcf14abcd89 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -1,5 +1,5 @@ /* Functions to manipulate keymaps. - Copyright (C) 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lastfile.c b/src/lastfile.c index d03dc2c8346..a229d94fd6a 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -1,5 +1,5 @@ /* Mark end of data space to dump as pure, for GNU Emacs. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lisp.h b/src/lisp.h index f6a4e6ae9c6..375e0e9cb9b 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1,6 +1,6 @@ /* Fundamental definitions for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lread.c b/src/lread.c index 2a9a8c060cc..bbe421c0eb5 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1,6 +1,7 @@ /* Lisp parsing and input streams. - Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998, - 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mac.c b/src/mac.c index 5558cbb797e..0d8c99ffb1e 100644 --- a/src/mac.c +++ b/src/mac.c @@ -1,5 +1,6 @@ /* Unix emulation routines for GNU Emacs on the Mac OS. - Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macfns.c b/src/macfns.c index daa1767fd52..160eb1f7774 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1,5 +1,5 @@ /* Graphical user interface functions for Mac OS. - Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macgui.h b/src/macgui.h index ca55bad7a8c..9591b7a8e3d 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -1,5 +1,6 @@ /* Definitions and headers for communication on the Mac OS. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macmenu.c b/src/macmenu.c index c7ee0dfaf21..a68ff04e405 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -1,5 +1,6 @@ /* Menu support for GNU Emacs on the for Mac OS. - Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.c b/src/macros.c index 6f854018d6a..8167e274dab 100644 --- a/src/macros.c +++ b/src/macros.c @@ -1,5 +1,6 @@ /* Keyboard macros. - Copyright (C) 1985, 1986, 1993, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.h b/src/macros.h index d9b99b9984e..7acd46dc2ed 100644 --- a/src/macros.h +++ b/src/macros.h @@ -1,5 +1,5 @@ /* Definitions for keyboard macro interpretation in GNU Emacs. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macterm.c b/src/macterm.c index 6fddcade274..fd76e164d49 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -1,5 +1,6 @@ /* Implementation of GUI terminal on the Mac OS. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macterm.h b/src/macterm.h index 71cd4db82c0..a4af9381867 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -1,5 +1,6 @@ /* Display module for Mac OS. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/makefile.w32-in b/src/makefile.w32-in index a4084046fac..1ee232949d9 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1,5 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. -# Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/marker.c b/src/marker.c index d6029c79c9d..11b077761e5 100644 --- a/src/marker.c +++ b/src/marker.c @@ -1,5 +1,6 @@ /* Markers: examining, setting and deleting. - Copyright (C) 1985, 1997, 1998, 2003 Free Software Foundation, Inc. + Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/md5.c b/src/md5.c index 039213fd76b..4f055447eac 100644 --- a/src/md5.c +++ b/src/md5.c @@ -1,6 +1,7 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of the GNU Emacs. The GNU C Library is free software; you can redistribute it and/or diff --git a/src/md5.h b/src/md5.h index 229da8daa8d..adcc6bf48f6 100644 --- a/src/md5.h +++ b/src/md5.h @@ -1,6 +1,7 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. - Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. The GNU C Library is free software; you can redistribute it and/or diff --git a/src/mem-limits.h b/src/mem-limits.h index aac8a396172..d7ac6a3e366 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -1,5 +1,6 @@ /* Includes for memory limit warnings. - Copyright (C) 1990, 93, 94, 95, 1996, 2004 Free Software Foundation, Inc. + Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/minibuf.c b/src/minibuf.c index 1d2d7372a4a..096e02c0034 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1,6 +1,6 @@ /* Minibuffer input and completion. - Copyright (C) 1985,86,93,94,95,96,97,98,99,2000,01,03,04,05 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mktime.c b/src/mktime.c index c61f1463564..025f54d95c2 100644 --- a/src/mktime.c +++ b/src/mktime.c @@ -1,5 +1,6 @@ /* Convert a `struct tm' to a time_t value. - Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Contributed by Paul Eggert (eggert@twinsun.com). NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/src/msdos.c b/src/msdos.c index 6dec71e0a32..145d9599fca 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,6 +1,6 @@ /* MS-DOS specific C utilities. -*- coding: raw-text -*- - Copyright (C) 1993, 94, 95, 96, 97, 1999, 2000, 01, 2003 - Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/msdos.h b/src/msdos.h index 7f2f013fd13..b6c6aca1493 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -1,5 +1,6 @@ /* MS-DOS specific C utilities, interface. - Copyright (C) 1993, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/prefix-args.c b/src/prefix-args.c index 5cfe6e4a095..ee1ee7e7c7f 100644 --- a/src/prefix-args.c +++ b/src/prefix-args.c @@ -1,5 +1,5 @@ /* prefix-args.c - echo each argument, prefixed by a string. - Copyright (C) 1992 Free Software Foundation, Inc. + Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/print.c b/src/print.c index 6150ff2efe6..65c48b6d82b 100644 --- a/src/print.c +++ b/src/print.c @@ -1,6 +1,7 @@ /* Lisp object printing and output streams. - Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, - 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.c b/src/process.c index 389c6b06e93..c683e7b8516 100644 --- a/src/process.c +++ b/src/process.c @@ -1,6 +1,7 @@ /* Asynchronous subprocess control for GNU Emacs. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1998, 1999, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1996, 1998, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.h b/src/process.h index a58b08a197e..cadc9b7031c 100644 --- a/src/process.h +++ b/src/process.h @@ -1,5 +1,6 @@ /* Definitions for asynchronous process control in GNU Emacs. - Copyright (C) 1985, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/puresize.h b/src/puresize.h index 5e51ae3b1ba..767c88bb807 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -1,5 +1,5 @@ /* How much read-only Lisp storage a dumped Emacs needs. - Copyright (C) 1993, 2002 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ralloc.c b/src/ralloc.c index 824fb536fc1..35a8cb9c58a 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1,5 +1,6 @@ /* Block-relocating memory allocator. - Copyright (C) 1993, 1995, 2000 Free Software Foundation, Inc. + Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/regex.c b/src/regex.c index c82bdb0edd9..fd18864110b 100644 --- a/src/regex.c +++ b/src/regex.c @@ -2,7 +2,8 @@ 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the internationalization features.) - Copyright (C) 1993,94,95,96,97,98,99,2000,04 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/regex.h b/src/regex.h index 89532b7ee9f..557700dc93d 100644 --- a/src/regex.h +++ b/src/regex.h @@ -1,7 +1,8 @@ /* Definitions for data structures and routines for the regular expression library, version 0.12. - Copyright (C) 1985,89,90,91,92,93,95,2000 Free Software Foundation, Inc. + Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/region-cache.c b/src/region-cache.c index 22eac35ca86..d49278eb886 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -1,6 +1,6 @@ /* Caching facts about regions of the buffer, for optimization. - Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/region-cache.h b/src/region-cache.h index 5c27d00740f..51d2ceb1e62 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -1,5 +1,6 @@ /* Header file: Caching facts about regions of the buffer, for optimization. - Copyright (C) 1985, 1986, 1993, 1995 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/scroll.c b/src/scroll.c index 48a50e59983..6e633d4e60b 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,5 +1,6 @@ /* Calculate what line insertion or deletion to do, and do it, - Copyright (C) 1985, 1986, 1990, 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/search.c b/src/search.c index 23807ffd520..aa7f6fda699 100644 --- a/src/search.c +++ b/src/search.c @@ -1,6 +1,6 @@ /* String search routines for GNU Emacs. - Copyright (C) 1985, 86,87,93,94,97,98, 1999, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sheap.c b/src/sheap.c index b7f01d448a8..635c3dc0144 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -1,8 +1,7 @@ /* simulate sbrk() with an array in .bss, for unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code - Copyright (C) 2004 - Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sound.c b/src/sound.c index 93e456cbc48..1e6a17d0275 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,5 +1,6 @@ /* sound.c -- sound support. - Copyright (C) 1998, 1999, 2001 Free Software Foundation. + Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/strftime.c b/src/strftime.c index 41566ec868e..88a54b7bee4 100644 --- a/src/strftime.c +++ b/src/strftime.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,2003 - Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. diff --git a/src/sunfns.c b/src/sunfns.c index 6a16e6cc08f..8de639b7480 100644 --- a/src/sunfns.c +++ b/src/sunfns.c @@ -1,5 +1,6 @@ /* Functions for Sun Windows menus and selection buffer. - Copyright (C) 1987, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is probably totally obsolete. In any case, the FSF is unwilling to support it. We agreed to include it in our distribution diff --git a/src/syntax.c b/src/syntax.c index 0b649ac0342..0071dcebd80 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,5 +1,6 @@ /* GNU Emacs routines to deal with syntax tables; also word and list parsing. - Copyright (C) 1985, 87, 93, 94, 95, 97, 1998, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syntax.h b/src/syntax.h index 581b4a783e0..c29e26c20b5 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -1,5 +1,6 @@ /* Declarations having to do with GNU Emacs syntax tables. - Copyright (C) 1985, 93, 94, 97, 1998 Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysdep.c b/src/sysdep.c index 8e8d02b844e..e63ee904f14 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1,6 +1,6 @@ /* Interfaces to system-dependent kernel and library entries. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysselect.h b/src/sysselect.h index 0030e737bc2..d57527f9ed1 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -1,5 +1,5 @@ /* sysselect.h - System-dependent definitions for the select function. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syssignal.h b/src/syssignal.h index dd13e3764aa..6a5cd39bde9 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -1,5 +1,6 @@ /* syssignal.h - System-dependent definitions for signals. - Copyright (C) 1993, 1999 Free Software Foundation, Inc. + Copyright (C) 1993, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systime.h b/src/systime.h index cf2bc0b084b..12d8d406d8e 100644 --- a/src/systime.h +++ b/src/systime.h @@ -1,5 +1,6 @@ /* systime.h - System-dependent definitions for time manipulations. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systty.h b/src/systty.h index b322ca60087..af9f5e3aa88 100644 --- a/src/systty.h +++ b/src/systty.h @@ -1,5 +1,6 @@ /* systty.h - System-dependent definitions for terminals. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syswait.h b/src/syswait.h index 78057e3fed4..37d59d68ac5 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -1,5 +1,6 @@ /* Define wait system call interface for Emacs. - Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/term.c b/src/term.c index 658cc97d804..c92219f8fe7 100644 --- a/src/term.c +++ b/src/term.c @@ -1,6 +1,6 @@ /* Terminal control module for terminals described by TERMCAP - Copyright (C) 1985, 86, 87, 93, 94, 95, 98, 2000, 2001, 2002, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1998, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termcap.c b/src/termcap.c index 5f2fa55556a..2f6f324eada 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -1,6 +1,6 @@ /* Work-alike for termcap, plus extra features. - Copyright (C) 1985, 86, 93, 94, 95, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/termchar.h b/src/termchar.h index 3a3c9978dd6..04583b9309c 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -1,5 +1,6 @@ /* Flags and parameters describing terminal's characteristics. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termhooks.h b/src/termhooks.h index 395e179ff49..641d21bdc06 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -1,6 +1,7 @@ /* Hooks by which low level terminal operations can be made to call other routines. - Copyright (C) 1985,86,93,94,2003 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/terminfo.c b/src/terminfo.c index 8f040d10c68..5c0aa1ccf05 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -1,5 +1,6 @@ /* Interface from Emacs to terminfo. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termopts.h b/src/termopts.h index 9d241f64678..eaac0557cdb 100644 --- a/src/termopts.h +++ b/src/termopts.h @@ -1,5 +1,6 @@ /* Flags and parameters describing user options for handling the terminal. - Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/textprop.c b/src/textprop.c index ec75c6907ae..fa9b0e498c5 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1,6 +1,6 @@ /* Interface code for dealing with text properties. - Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/tparam.c b/src/tparam.c index e05f01f4911..e593589d5cb 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -1,5 +1,6 @@ /* Merge parameters into a termcap entry string. - Copyright (C) 1985, 87, 93, 95, 2000 Free Software Foundation, Inc. + Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/uaf.h b/src/uaf.h index 71ae7267147..7863c41227e 100644 --- a/src/uaf.h +++ b/src/uaf.h @@ -1,5 +1,5 @@ /* GNU Emacs VMS UAF definition file. - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/undo.c b/src/undo.c index 13ee40130a9..9839906ca7e 100644 --- a/src/undo.c +++ b/src/undo.c @@ -1,6 +1,6 @@ /* undo handling for GNU Emacs. - Copyright (C) 1990, 1993, 1994, 2000, 2002, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1990, 1993, 1994, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexaix.c b/src/unexaix.c index 4c9f2727e88..071f09898ed 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -1,5 +1,6 @@ /* Dump an executable image. - Copyright (C) 1985, 1986, 1987, 1988, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexalpha.c b/src/unexalpha.c index aa32f411fcb..069c39b398b 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c @@ -1,6 +1,7 @@ /* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf). - Copyright (C) 1994, 2000 Free Software Foundation, Inc. + Copyright (C) 1994, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexapollo.c b/src/unexapollo.c index d9bff963695..f1481d684a3 100644 --- a/src/unexapollo.c +++ b/src/unexapollo.c @@ -1,5 +1,6 @@ /* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x - Copyright (C) 1988, 1994 Free Software Foundation, Inc. + Copyright (C) 1988, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexconvex.c b/src/unexconvex.c index cbd1dd29fda..6f05e4ae938 100644 --- a/src/unexconvex.c +++ b/src/unexconvex.c @@ -7,7 +7,8 @@ think about it, or about whether other Emacs maintenance might break it. - Copyright (C) 1985, 1986, 1988 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexcw.c b/src/unexcw.c index 77d5866136b..cfd87781a16 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -1,8 +1,7 @@ /* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code - Copyright (C) 2004 - Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexec.c b/src/unexec.c index bf231b00626..ebf813306da 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1985,86,87,88,92,93,94 Free Software Foundation, Inc. +/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexelf.c b/src/unexelf.c index 9e8b827a754..ee563b36a97 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1985,86,87,88,90,92,1999,2000,01,2003 - Free Software Foundation, Inc. +/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexenix.c b/src/unexenix.c index 94ac3eb821d..159c0b2f6d8 100644 --- a/src/unexenix.c +++ b/src/unexenix.c @@ -6,7 +6,8 @@ we don't plan to think about it, or about whether other Emacs maintenance might break it. - Copyright (C) 1988, 1994 Free Software Foundation, Inc. + Copyright (C) 1988, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmacosx.c b/src/unexmacosx.c index a191c0721e5..9db9622f6f5 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -1,5 +1,5 @@ /* Dump Emacs in Mach-O format for use on Mac OS X. - Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmips.c b/src/unexmips.c index 53b40f62742..212f7ed5926 100644 --- a/src/unexmips.c +++ b/src/unexmips.c @@ -6,7 +6,8 @@ we don't plan to think about it, or about whether other Emacs maintenance might break it. - Copyright (C) 1988, 1994 Free Software Foundation, Inc. + Copyright (C) 1988, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexnext.c b/src/unexnext.c index 2a0b66bc868..b374dd8e9b8 100644 --- a/src/unexnext.c +++ b/src/unexnext.c @@ -1,5 +1,6 @@ /* Dump Emacs in macho format. - Copyright (C) 1990, 1993 Free Software Foundation, Inc. + Copyright (C) 1990, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Written by Bradley Taylor (btaylor@next.com). This file is part of GNU Emacs. diff --git a/src/unexsni.c b/src/unexsni.c index 0c67af899d5..d6b3ae68969 100644 --- a/src/unexsni.c +++ b/src/unexsni.c @@ -1,6 +1,6 @@ /* Unexec for Siemens machines running Sinix (modified SVR4). - Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexsunos4.c b/src/unexsunos4.c index 9ad06b6adaf..5e221050f36 100644 --- a/src/unexsunos4.c +++ b/src/unexsunos4.c @@ -1,5 +1,6 @@ /* Unexec for Sunos 4 using shared libraries. - Copyright (C) 1990, 1994, 1999 Free Software Foundation, Inc. + Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexw32.c b/src/unexw32.c index 5380ca5c8f7..bc462c18a10 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -1,5 +1,5 @@ /* unexec for GNU Emacs on Windows NT. - Copyright (C) 1994, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/vm-limit.c b/src/vm-limit.c index 1840eb61c0c..0c12dec9b04 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -1,5 +1,6 @@ /* Functions for memory limit warnings. - Copyright (C) 1990, 1992 Free Software Foundation, Inc. + Copyright (C) 1990, 1992, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w16select.c b/src/w16select.c index 406f0a1b884..b0c30eb58d8 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -1,5 +1,6 @@ /* 16-bit Windows Selection processing for emacs on MS-Windows - Copyright (C) 1996, 1997, 2001 Free Software Foundation. + Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.c b/src/w32.c index 25283c3b4c6..c7f6e3172f9 100644 --- a/src/w32.c +++ b/src/w32.c @@ -1,5 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1994, 1995, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.h b/src/w32.h index 622a2256f0f..2981e5bb979 100644 --- a/src/w32.h +++ b/src/w32.h @@ -2,7 +2,7 @@ #define EMACS_W32_H /* Support routines for the NT version of Emacs. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.c b/src/w32bdf.c index e8612c7b5d6..10780f2f0c9 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c @@ -1,5 +1,5 @@ /* Implementation of BDF font handling on the Microsoft W32 API. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.h b/src/w32bdf.h index ca8a5f368cb..9d3d306d56f 100644 --- a/src/w32bdf.h +++ b/src/w32bdf.h @@ -1,5 +1,5 @@ /* Definitions and header for handling BDF fonts on the Microsoft W32 API. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32console.c b/src/w32console.c index 0ebda179667..a81591fb96f 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -1,5 +1,6 @@ /* Terminal hooks for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1992, 1999 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32fns.c b/src/w32fns.c index dc8d5998765..93469418137 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1,6 +1,6 @@ /* Graphical user interface functions for the Microsoft W32 API. - Copyright (C) 1989, 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 04 - Free Software Foundation, Inc. + Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32gui.h b/src/w32gui.h index 1fd145cd026..644adcea924 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication on the Microsoft W32 API. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.c b/src/w32heap.c index 7de08bb2b4e..a0c50da5506 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -1,5 +1,5 @@ /* Heap management routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.h b/src/w32heap.h index 259d0bf9ede..1b3b815b115 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -1,5 +1,5 @@ /* Heap management routines (including unexec) for GNU Emacs on Windows NT. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.c b/src/w32inevt.c index cc7c5e1e612..ffa2cd0989a 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -1,5 +1,6 @@ /* Input event support for Emacs on the Microsoft W32 API. - Copyright (C) 1992, 1993, 1995 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.h b/src/w32inevt.h index f811c96c313..e0a9428720f 100644 --- a/src/w32inevt.h +++ b/src/w32inevt.h @@ -1,5 +1,5 @@ /* Input routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32menu.c b/src/w32menu.c index 0e4902b6ce4..75c55ef4f85 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1,5 +1,6 @@ /* Menu support for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1986,88,93,94,96,98,1999,2003 Free Software Foundation, Inc. + Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32proc.c b/src/w32proc.c index 7e344985f4e..628a763c675 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -1,5 +1,6 @@ /* Process support for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1992, 95, 99, 2000, 01, 04 Free Software Foundation, Inc. + Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32reg.c b/src/w32reg.c index a70835ac303..40d84df3d14 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -1,5 +1,6 @@ /* Emulate the X Resource Manager through the registry. - Copyright (C) 1990, 1993, 1994 Free Software Foundation. + Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32select.c b/src/w32select.c index db29c078149..3556c62a35f 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -1,5 +1,6 @@ /* Selection processing for Emacs on the Microsoft W32 API. - Copyright (C) 1993, 1994, 2004 Free Software Foundation. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.c b/src/w32term.c index 796a341ae0c..8f52b5178d0 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1,6 +1,6 @@ /* Implementation of GUI terminal on the Microsoft W32 API. - Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.h b/src/w32term.h index cc305485f1f..fb4983bf4c7 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -1,5 +1,6 @@ /* Definitions and headers for communication on the Microsoft W32 API. - Copyright (C) 1995, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32xfns.c b/src/w32xfns.c index ba705d9498d..46a71b942c7 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -1,5 +1,6 @@ /* Functions taken directly from X sources for use with the Microsoft W32 API. - Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999 Free Software Foundation. + Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.c b/src/widget.c index fdd927cb175..0386890d93b 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,5 +1,6 @@ /* The emacs frame widget. - Copyright (C) 1992, 1993, 2000 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.h b/src/widget.h index 174a6a720de..00d743234c0 100644 --- a/src/widget.h +++ b/src/widget.h @@ -1,5 +1,5 @@ /* The emacs frame widget public header file. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widgetprv.h b/src/widgetprv.h index ce087e825cb..2027b4f602d 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -1,5 +1,5 @@ /* The emacs frame widget private header file. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.c b/src/window.c index 7d5d8d835ba..ccc3cdfa761 100644 --- a/src/window.c +++ b/src/window.c @@ -1,7 +1,7 @@ /* Window creation, deletion and examination for GNU Emacs. Does not include redisplay. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.h b/src/window.h index 99274e04ad1..df359f37db2 100644 --- a/src/window.h +++ b/src/window.h @@ -1,6 +1,6 @@ /* Window definitions for GNU Emacs. - Copyright (C) 1985,86,93,95,97,98,99, 2000,01,03,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xdisp.c b/src/xdisp.c index d7de7dbe826..8cb4b38211f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1,6 +1,7 @@ /* Display generation from window structure and buffer text. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfaces.c b/src/xfaces.c index e4a18a27bbc..bf8e0026749 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1,6 +1,6 @@ /* xfaces.c -- "Face" primitives. - Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation. + Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfns.c b/src/xfns.c index 9c3965d7e2b..0bcf458b042 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1,6 +1,6 @@ /* Functions for the X window system. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation. + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xmenu.c b/src/xmenu.c index bcc0e57bcdb..184ff2c8c47 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. - Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004, - 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xrdb.c b/src/xrdb.c index 248e5eba64d..822fb6e2624 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -1,5 +1,6 @@ /* Deal with the X Resource Manager. - Copyright (C) 1990, 1993, 1994, 2000, 2001 Free Software Foundation. + Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xselect.c b/src/xselect.c index a424259416b..4db86c1cc5a 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1,6 +1,6 @@ /* X Selection processing for Emacs. - Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004 - Free Software Foundation. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xsmfns.c b/src/xsmfns.c index 9a94adbb997..4285dd76718 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, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.c b/src/xterm.c index ab46a7700e3..35c12938fc0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.h b/src/xterm.h index df444bfea7b..386b297fb8f 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1,6 +1,6 @@ /* Definitions and headers for communication with X protocol. - Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000,01,02,03,04 - Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. -- cgit v1.2.1 From 3ae9c96ab9b35ea93589911c350af1d353bafd20 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:35:09 +0000 Subject: (set_terminal_modes): If no TS_termcap_modes string, output newlines to scroll the old screen contents off the screen. --- src/term.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/term.c b/src/term.c index c92219f8fe7..76cf2e2c6f0 100644 --- a/src/term.c +++ b/src/term.c @@ -449,7 +449,17 @@ set_terminal_modes () { if (FRAME_TERMCAP_P (XFRAME (selected_frame))) { - OUTPUT_IF (TS_termcap_modes); + if (TS_termcap_modes) + OUTPUT (TS_termcap_modes); + else + { + /* Output enough newlines to scroll all the old screen contents + off the screen, so it won't be overwritten and lost. */ + int i; + for (i = 0; i < FRAME_LINES (XFRAME (selected_frame)); i++) + putchar ('\n'); + } + OUTPUT_IF (TS_cursor_visible); OUTPUT_IF (TS_keypad_mode); losecursor (); -- cgit v1.2.1 From 780a7814436dd62e3a1e8a888fde43fb899dcfdc Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:36:12 +0000 Subject: (syms_of_fns): Add `emacs' to features. --- src/fns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/fns.c b/src/fns.c index 60a98fd5709..1e26ec9a392 100644 --- a/src/fns.c +++ b/src/fns.c @@ -5833,7 +5833,7 @@ syms_of_fns () DEFVAR_LISP ("features", &Vfeatures, doc: /* A list of symbols which are the features of the executing emacs. Used by `featurep' and `require', and altered by `provide'. */); - Vfeatures = Qnil; + Vfeatures = Fcons (intern ("emacs"), Qnil); Qsubfeatures = intern ("subfeatures"); staticpro (&Qsubfeatures); -- cgit v1.2.1 From e09b9180d525e04497271f23cb7fc99fea21421e Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:38:36 +0000 Subject: (endif): Convert -script into -scriptload. (standard_args): Add -scriptload. Allow -basic-display with one dash. --- src/emacs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/emacs.c b/src/emacs.c index 87aee828420..985a3eae96f 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1153,9 +1153,9 @@ main (argc, argv if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args)) { noninteractive = 1; /* Set batch mode. */ - /* Convert --script to -l, un-skip it, and sort again so that -l will be - handled in proper sequence. */ - argv[skip_args - 1] = "-l"; + /* Convert --script to --scriptload, un-skip it, and sort again + so that it will be handled in proper sequence. */ + argv[skip_args - 1] = "-scriptload"; skip_args -= 2; sort_args (argc, argv); } @@ -1834,7 +1834,7 @@ struct standard_args standard_args[] = { "-itype", 0, 15, 0 }, { "-iconic", "--iconic", 15, 0 }, { "-D", "--basic-display", 12, 0}, - { "--basic-display", 0, 12, 0}, + { "-basic-display", 0, 12, 0}, { "-bg", "--background-color", 10, 1 }, { "-background", 0, 10, 1 }, { "-fg", "--foreground-color", 10, 1 }, @@ -1868,6 +1868,7 @@ struct standard_args standard_args[] = { "-directory", 0, 0, 1 }, { "-l", "--load", 0, 1 }, { "-load", 0, 0, 1 }, + { "-scriptload", "--scriptload", 0, 1 }, { "-f", "--funcall", 0, 1 }, { "-funcall", 0, 0, 1 }, { "-eval", "--eval", 0, 1 }, -- cgit v1.2.1 From 44edd521a0d425ea79433bf170233a2b0084820b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:42:38 +0000 Subject: (Fframe_or_buffer_changed_p): Take an arg so it can be used with various state vectors. --- src/ChangeLog | 13 +++++++++ src/dispnew.c | 88 ++++++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 76 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index aa73da64547..a44fc3aaa48 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2005-08-07 Richard M. Stallman + + * dispnew.c (Fframe_or_buffer_changed_p): Take an arg + so it can be used with various state vectors. + + * emacs.c (endif): Convert -script into -scriptload. + (standard_args): Add -scriptload. Allow -basic-display with one dash. + + * fns.c (syms_of_fns): Add `emacs' to features. + + * term.c (set_terminal_modes): If no TS_termcap_modes string, + output newlines to scroll the old screen contents off the screen. + 2005-08-06 Thien-Thi Nguyen * floatfns.c (Fexpt): Use floats for negative exponent. diff --git a/src/dispnew.c b/src/dispnew.c index 642573b652c..a5057273bfe 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6463,68 +6463,106 @@ usage: (sit-for SECONDS &optional NODISP OLD-NODISP) */) /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the session's frames, frame names, buffers, buffer-read-only flags, and - buffer-modified-flags, and a trailing sentinel (so we don't need to - add length checks). */ + buffer-modified-flags. */ static Lisp_Object frame_and_buffer_state; DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, - Sframe_or_buffer_changed_p, 0, 0, 0, + Sframe_or_buffer_changed_p, 0, 1, 0, doc: /* Return non-nil if the frame and buffer state appears to have changed. -The state variable is an internal vector containing all frames and buffers, +VARIABLE is a variable name whose value is either nil or a state vector +that will be updated to contain all frames and buffers, aside from buffers whose names start with space, -along with the buffers' read-only and modified flags, which allows a fast -check to see whether the menu bars might need to be recomputed. +along with the buffers' read-only and modified flags. This allows a fast +check to see whether buffer menus might need to be recomputed. If this function returns non-nil, it updates the internal vector to reflect -the current state. */) - () +the current state. + +If VARIABLE is nil, an internal variable is used. Users should not +pass nil for VARIABLE. */) + (variable) + Lisp_Object variable; { - Lisp_Object tail, frame, buf; - Lisp_Object *vecp; + Lisp_Object state, tail, frame, buf; + Lisp_Object *vecp, *end; int n; - vecp = XVECTOR (frame_and_buffer_state)->contents; + if (! NILP (variable)) + { + CHECK_SYMBOL (variable); + state = Fsymbol_value (variable); + if (! VECTORP (state)) + goto changed; + } + else + state = frame_and_buffer_state; + + vecp = XVECTOR (state)->contents; + end = vecp + XVECTOR (state)->size; + FOR_EACH_FRAME (tail, frame) { + if (vecp == end) + goto changed; if (!EQ (*vecp++, frame)) goto changed; + if (vecp == end) + goto changed; if (!EQ (*vecp++, XFRAME (frame)->name)) goto changed; } - /* Check that the buffer info matches. - No need to test for the end of the vector - because the last element of the vector is lambda - and that will always cause a mismatch. */ + /* Check that the buffer info matches. */ for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) { buf = XCDR (XCAR (tail)); /* Ignore buffers that aren't included in buffer lists. */ if (SREF (XBUFFER (buf)->name, 0) == ' ') continue; + if (vecp == end) + goto changed; if (!EQ (*vecp++, buf)) goto changed; + if (vecp == end) + goto changed; if (!EQ (*vecp++, XBUFFER (buf)->read_only)) goto changed; + if (vecp == end) + goto changed; if (!EQ (*vecp++, Fbuffer_modified_p (buf))) goto changed; } + if (vecp == end) + goto changed; /* Detect deletion of a buffer at the end of the list. */ if (EQ (*vecp, Qlambda)) return Qnil; + + /* Come here if we decide the data has changed. */ changed: - /* Start with 1 so there is room for at least one lambda at the end. */ + /* Count the size we will need. + Start with 1 so there is room for at least one lambda at the end. */ n = 1; FOR_EACH_FRAME (tail, frame) n += 2; for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) n += 3; - /* Reallocate the vector if it's grown, or if it's shrunk a lot. */ - if (n > XVECTOR (frame_and_buffer_state)->size - || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2) + /* Reallocate the vector if data has grown to need it, + or if it has shrunk a lot. */ + if (! VECTORP (state) + || n > XVECTOR (state)->size + || n + 20 < XVECTOR (state)->size / 2) /* Add 20 extra so we grow it less often. */ - frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda); - vecp = XVECTOR (frame_and_buffer_state)->contents; + { + state = Fmake_vector (make_number (n + 20), Qlambda); + if (! NILP (variable)) + Fset (variable, state); + else + frame_and_buffer_state = state; + } + + /* Record the new data in the (possibly reallocated) vector. */ + vecp = XVECTOR (state)->contents; FOR_EACH_FRAME (tail, frame) { *vecp++ = frame; @@ -6542,12 +6580,12 @@ the current state. */) } /* Fill up the vector with lambdas (always at least one). */ *vecp++ = Qlambda; - while (vecp - XVECTOR (frame_and_buffer_state)->contents - < XVECTOR (frame_and_buffer_state)->size) + while (vecp - XVECTOR (state)->contents + < XVECTOR (state)->size) *vecp++ = Qlambda; /* Make sure we didn't overflow the vector. */ - if (vecp - XVECTOR (frame_and_buffer_state)->contents - > XVECTOR (frame_and_buffer_state)->size) + if (vecp - XVECTOR (state)->contents + > XVECTOR (state)->size) abort (); return Qt; } -- cgit v1.2.1 From 8b6a95513d11162055cf1cdf7eb9a4a2ade5f1c3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:47:48 +0000 Subject: (Fexpt): Undo previous change. --- src/ChangeLog | 2 ++ src/floatfns.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index a44fc3aaa48..e9ade1c6dfd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2005-08-07 Richard M. Stallman + * floatfns.c (Fexpt): Undo previous change. + * dispnew.c (Fframe_or_buffer_changed_p): Take an arg so it can be used with various state vectors. diff --git a/src/floatfns.c b/src/floatfns.c index 79574e0a69b..57bece2708b 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -461,8 +461,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg1); CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ - && INTEGERP (arg2) /* don't promote, if both are ints, and */ - && 0 <= XINT (arg2)) /* we are sure the result is not fractional */ + && INTEGERP (arg2)) /* don't promote, if both are ints */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; -- cgit v1.2.1 From aa41b0bf0ed597dd1adac28530a12872dbf9ac26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 8 Aug 2005 15:01:35 +0000 Subject: * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that should not be there, causing menu display errors in GTK 2.6.9. --- src/gtkutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/gtkutil.c b/src/gtkutil.c index d8835c2b5fd..7f2e411b933 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2606,7 +2606,7 @@ xg_modify_menubar_widgets (menubar, f, val, deep_p, xg_update_menubar (menubar, f, &list, list, 0, val->contents, select_cb, highlight_cb, cl_data); - if (deep_p); + if (deep_p) { widget_value *cur; -- cgit v1.2.1 From 9346901076ec60827a70372faf5ba791423a3bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 8 Aug 2005 15:02:39 +0000 Subject: * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that should not be there, causing menu display errors with GTK 2.6.9. --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index e9ade1c6dfd..a35daab6728 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-08-08 Jan Dj,Ad(Brv + + * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that + should not be there, causing menu display errors with GTK 2.6.9. + 2005-08-07 Richard M. Stallman * floatfns.c (Fexpt): Undo previous change. -- cgit v1.2.1 From 5a9807a8bda5980633db765300dad40ee3aed2c6 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Tue, 9 Aug 2005 07:37:25 +0000 Subject: (Fexpt): Use floats for negative exponent. --- src/ChangeLog | 4 ++++ src/floatfns.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index a35daab6728..256b720eace 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-08-09 Thien-Thi Nguyen + + * floatfns.c (Fexpt): Use floats for negative exponent. + 2005-08-08 Jan Dj,Ad(Brv * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that diff --git a/src/floatfns.c b/src/floatfns.c index 57bece2708b..79574e0a69b 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -461,7 +461,8 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg1); CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ - && INTEGERP (arg2)) /* don't promote, if both are ints */ + && INTEGERP (arg2) /* don't promote, if both are ints, and */ + && 0 <= XINT (arg2)) /* we are sure the result is not fractional */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; -- cgit v1.2.1 From 17365af46c54d8587a4e13c1c560b9869d57ecb5 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:10:29 +0000 Subject: (QUIT): Throw t to Vthrow_on_input. --- src/lisp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lisp.h b/src/lisp.h index 375e0e9cb9b..70f5ddffa94 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1797,7 +1797,7 @@ extern int interrupt_input_pending; Lisp_Object flag = Vquit_flag; \ Vquit_flag = Qnil; \ if (EQ (Vthrow_on_input, flag)) \ - Fthrow (Vthrow_on_input, Qnil); \ + Fthrow (Vthrow_on_input, Qt); \ Fsignal (Qquit, Qnil); \ } \ else if (interrupt_input_pending) \ -- cgit v1.2.1 From a8f0f551007be7c04b1fe039a8b74f3a605146f3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:10:40 +0000 Subject: (BYTE_CODE_QUIT): Throw t to Vthrow_on_input. --- src/bytecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/bytecode.c b/src/bytecode.c index 918ebdd550b..e5a3e7b2a7c 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -389,7 +389,7 @@ unmark_byte_stack () Vquit_flag = Qnil; \ BEFORE_POTENTIAL_GC (); \ if (EQ (Vthrow_on_input, flag)) \ - Fthrow (Vthrow_on_input, Qnil); \ + Fthrow (Vthrow_on_input, Qt); \ Fsignal (Qquit, Qnil); \ AFTER_POTENTIAL_GC (); \ } \ -- cgit v1.2.1 From 61298e176c1a1e27aa09c6531b54622c5aff3bbd Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:11:00 +0000 Subject: *** empty log message *** --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 256b720eace..68614d7c8c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-08-09 Richard M. Stallman + + * bytecode.c (BYTE_CODE_QUIT): Throw t to Vthrow_on_input. + + * lisp.h (QUIT): Throw t to Vthrow_on_input. + 2005-08-09 Thien-Thi Nguyen * floatfns.c (Fexpt): Use floats for negative exponent. -- cgit v1.2.1 From 6e6fc3fd4b8195264bb64a70834d354cbbed98a0 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 11 Aug 2005 13:58:12 +0000 Subject: (syms_of_image): Init image_types here, and call define_image_type. (init_image): Not here. --- src/image.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/image.c b/src/image.c index 98190d3381c..dfe592f3c14 100644 --- a/src/image.c +++ b/src/image.c @@ -8025,6 +8025,11 @@ syms_of_image () { extern Lisp_Object Qrisky_local_variable; /* Syms_of_xdisp has already run. */ + /* Initialize this only once, since that's what we do with Vimage_types + and they are supposed to be in sync. Initializing here gives correct + operation on GNU/Linux of calling dump-emacs after loading some images. */ + image_types = NULL; + /* Must be defined now becase we're going to update it below, while defining the supported image types. */ DEFVAR_LISP ("image-types", &Vimage_types, @@ -8033,6 +8038,9 @@ Each element of the list is a symbol for a image type, like 'jpeg or 'png. To check whether it is really supported, use `image-type-available-p'. */); Vimage_types = Qnil; + define_image_type (&xbm_type, 1); + define_image_type (&pbm_type, 1); + DEFVAR_LISP ("image-library-alist", &Vimage_library_alist, doc: /* Alist of image types vs external libraries needed to display them. @@ -8163,11 +8171,6 @@ meaning don't clear the cache. */); void init_image () { - image_types = NULL; - - define_image_type (&xbm_type, 1); - define_image_type (&pbm_type, 1); - #ifdef MAC_OS /* Animated gifs use QuickTime Movie Toolbox. So initialize it here. */ EnterMovies (); -- cgit v1.2.1 From 6e2d14c82468c52831d2d6c513d6bd4ef6afc406 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 11 Aug 2005 14:01:38 +0000 Subject: *** empty log message *** --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 68614d7c8c4..7a572c8271c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-08-11 Richard M. Stallman + + * image.c (syms_of_image): Init image_types here, and call define_image_type. + (init_image): Not here. + 2005-08-09 Richard M. Stallman * bytecode.c (BYTE_CODE_QUIT): Throw t to Vthrow_on_input. -- cgit v1.2.1 From 5d91377a3c6cefd42c4f2552caa8e6c47355cad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 13 Aug 2005 09:47:57 +0000 Subject: * gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare. --- src/gtkutil.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/gtkutil.h b/src/gtkutil.h index 48060533a57..a97c1b5ca8a 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -199,6 +199,10 @@ extern void x_wm_set_size_hint P_ ((FRAME_PTR f, int user_position)); extern void xg_set_background_color P_ ((FRAME_PTR f, unsigned long bg)); +extern GdkPixbuf * xg_get_pixbuf_from_pix_and_mask P_ ((GdkPixmap *gpix, + GdkPixmap *gmask, + GdkColormap *cmap)); + /* Mark all callback data that are Lisp_object:s during GC. */ extern void xg_mark_data P_ ((void)); -- cgit v1.2.1 From 5695f1b4ba430c364635cad172f5746a98c7426d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 13 Aug 2005 09:48:17 +0000 Subject: * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function. (xg_get_image_for_pixmap): Move some code to xg_get_pixbuf_from_pix_and_mask, and call it. --- src/gtkutil.c | 109 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 48 deletions(-) (limited to 'src') diff --git a/src/gtkutil.c b/src/gtkutil.c index 7f2e411b933..0e0f6cd898a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -239,6 +239,64 @@ xg_create_default_cursor (dpy) return gdk_cursor_new_for_display (gdpy, GDK_LEFT_PTR); } +/* Apply GMASK to GPIX and return a GdkPixbuf with an alpha channel. */ + +GdkPixbuf * +xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap) + GdkPixmap *gpix; + GdkPixmap *gmask; + GdkColormap *cmap; +{ + int x, y, width, height, rowstride, mask_rowstride; + GdkPixbuf *icon_buf, *tmp_buf; + guchar *pixels; + guchar *mask_pixels; + + gdk_drawable_get_size (gpix, &width, &height); + tmp_buf = gdk_pixbuf_get_from_drawable (NULL, gpix, cmap, + 0, 0, 0, 0, width, height); + icon_buf = gdk_pixbuf_add_alpha (tmp_buf, FALSE, 0, 0, 0); + g_object_unref (G_OBJECT (tmp_buf)); + + if (gmask) + { + GdkPixbuf *mask_buf = gdk_pixbuf_get_from_drawable (NULL, + gmask, + NULL, + 0, 0, 0, 0, + width, height); + guchar *pixels = gdk_pixbuf_get_pixels (icon_buf); + guchar *mask_pixels = gdk_pixbuf_get_pixels (mask_buf); + int rowstride = gdk_pixbuf_get_rowstride (icon_buf); + int mask_rowstride = gdk_pixbuf_get_rowstride (mask_buf); + int y; + + for (y = 0; y < height; ++y) + { + guchar *iconptr, *maskptr; + int x; + + iconptr = pixels + y * rowstride; + maskptr = mask_pixels + y * mask_rowstride; + + for (x = 0; x < width; ++x) + { + /* In a bitmap, RGB is either 255/255/255 or 0/0/0. Checking + just R is sufficient. */ + if (maskptr[0] == 0) + iconptr[3] = 0; /* 0, 1, 2 is R, G, B. 3 is alpha. */ + + iconptr += rowstride/width; + maskptr += mask_rowstride/width; + } + } + + g_object_unref (G_OBJECT (mask_buf)); + } + + return icon_buf; +} + /* For the image defined in IMG, make and return a GtkImage. For displays with 8 planes or less we must make a GdkPixbuf and apply the mask manually. Otherwise the highlightning and dimming the tool bar code in GTK does @@ -311,60 +369,15 @@ xg_get_image_for_pixmap (f, img, widget, old_widget) } else { + /* This is a workaround to make icons look good on pseudo color displays. Apparently GTK expects the images to have an alpha channel. If they don't, insensitive and activated icons will look bad. This workaround does not work on monochrome displays, and is not needed on true color/static color displays (i.e. 16 bits and higher). */ - int x, y, width, height, rowstride, mask_rowstride; - GdkPixbuf *icon_buf, *tmp_buf; - guchar *pixels; - guchar *mask_pixels; - - gdk_drawable_get_size (gpix, &width, &height); - tmp_buf = gdk_pixbuf_get_from_drawable (NULL, - gpix, - gtk_widget_get_colormap (widget), - 0, 0, 0, 0, width, height); - icon_buf = gdk_pixbuf_add_alpha (tmp_buf, FALSE, 0, 0, 0); - g_object_unref (G_OBJECT (tmp_buf)); - - if (gmask) - { - GdkPixbuf *mask_buf = gdk_pixbuf_get_from_drawable (NULL, - gmask, - NULL, - 0, 0, 0, 0, - width, height); - guchar *pixels = gdk_pixbuf_get_pixels (icon_buf); - guchar *mask_pixels = gdk_pixbuf_get_pixels (mask_buf); - int rowstride = gdk_pixbuf_get_rowstride (icon_buf); - int mask_rowstride = gdk_pixbuf_get_rowstride (mask_buf); - int y; - - for (y = 0; y < height; ++y) - { - guchar *iconptr, *maskptr; - int x; - - iconptr = pixels + y * rowstride; - maskptr = mask_pixels + y * mask_rowstride; - - for (x = 0; x < width; ++x) - { - /* In a bitmap, RGB is either 255/255/255 or 0/0/0. Checking - just R is sufficient. */ - if (maskptr[0] == 0) - iconptr[3] = 0; /* 0, 1, 2 is R, G, B. 3 is alpha. */ - - iconptr += rowstride/width; - maskptr += mask_rowstride/width; - } - } - - g_object_unref (G_OBJECT (mask_buf)); - } + GdkColormap *cmap = gtk_widget_get_colormap (widget); + GdkPixbuf *icon_buf = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap); if (! old_widget) old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf)); -- cgit v1.2.1 From cb515a21c74f594bba6c8b917d271b1eeeacdf36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 13 Aug 2005 09:48:36 +0000 Subject: * xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask to get an GTK icon and set it with GTK functions to avoid having GTK override an icon set with just X functions. --- src/xterm.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/xterm.c b/src/xterm.c index 35c12938fc0..84b1dae3515 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9250,7 +9250,19 @@ x_wm_set_icon_pixmap (f, pixmap_id) #endif } -#ifdef USE_X_TOOLKIT /* same as in x_wm_set_window_state. */ + +#ifdef USE_GTK + { + GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); + GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap); + GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask); + GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL); + + gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp); + return; + } + +#elif defined (USE_X_TOOLKIT) /* same as in x_wm_set_window_state. */ { Arg al[1]; @@ -9260,12 +9272,12 @@ x_wm_set_icon_pixmap (f, pixmap_id) XtSetValues (f->output_data.x->widget, al, 1); } -#else /* not USE_X_TOOLKIT */ +#else /* not USE_X_TOOLKIT && not USE_GTK */ f->output_data.x->wm_hints.flags |= (IconPixmapHint | IconMaskHint); XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); -#endif /* not USE_X_TOOLKIT */ +#endif /* not USE_X_TOOLKIT && not USE_GTK */ } void -- cgit v1.2.1 From 6c7eb7212c99c54a6169dc0a6dc4a8a7f151407a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 13 Aug 2005 09:49:10 +0000 Subject: * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function. (xg_get_image_for_pixmap): Move some code to xg_get_pixbuf_from_pix_and_mask, and call it. * gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare. * xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask to get an GTK icon and set it with GTK functions to avoid having GTK override an icon set with just X functions. --- src/ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 7a572c8271c..bd891a54015 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2005-08-13 Jan Dj,Ad(Brv + + * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function. + (xg_get_image_for_pixmap): Move some code to + xg_get_pixbuf_from_pix_and_mask, and call it. + + * gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare. + + * xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask + to get an GTK icon and set it with GTK functions to avoid having GTK + override an icon set with just X functions. + 2005-08-11 Richard M. Stallman * image.c (syms_of_image): Init image_types here, and call define_image_type. -- cgit v1.2.1 From 7c4e3a3219dd2145393ca01cb31a45a4a433e147 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 15 Aug 2005 01:47:01 +0000 Subject: (syms_of_image): Init Qxbm, Qpbm before calling define_image_type. --- src/image.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/image.c b/src/image.c index dfe592f3c14..3e8a62801b0 100644 --- a/src/image.c +++ b/src/image.c @@ -8038,9 +8038,6 @@ Each element of the list is a symbol for a image type, like 'jpeg or 'png. To check whether it is really supported, use `image-type-available-p'. */); Vimage_types = Qnil; - define_image_type (&xbm_type, 1); - define_image_type (&pbm_type, 1); - DEFVAR_LISP ("image-library-alist", &Vimage_library_alist, doc: /* Alist of image types vs external libraries needed to display them. @@ -8058,6 +8055,17 @@ listed; they're always supported. */); Vimage_type_cache = Qnil; staticpro (&Vimage_type_cache); + Qpbm = intern ("pbm"); + staticpro (&Qpbm); + ADD_IMAGE_TYPE(Qpbm); + + Qxbm = intern ("xbm"); + staticpro (&Qxbm); + ADD_IMAGE_TYPE(Qxbm); + + define_image_type (&xbm_type, 1); + define_image_type (&pbm_type, 1); + QCascent = intern (":ascent"); staticpro (&QCascent); QCmargin = intern (":margin"); @@ -8102,14 +8110,6 @@ listed; they're always supported. */); staticpro (&QCpt_height); #endif /* HAVE_GHOSTSCRIPT */ - Qpbm = intern ("pbm"); - staticpro (&Qpbm); - ADD_IMAGE_TYPE(Qpbm); - - Qxbm = intern ("xbm"); - staticpro (&Qxbm); - ADD_IMAGE_TYPE(Qxbm); - #if defined (HAVE_XPM) || defined (MAC_OS) Qxpm = intern ("xpm"); staticpro (&Qxpm); -- cgit v1.2.1 From 0bf14bfd0c8b0d1508c33b53a6f48240d099f689 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 15 Aug 2005 02:06:44 +0000 Subject: *** empty log message *** --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index bd891a54015..1ac51d41a80 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-08-14 Richard M. Stallman + + * image.c (syms_of_image): Init Qxbm, Qpbm before calling define_image_type. + 2005-08-13 Jan Dj,Ad(Brv * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function. -- cgit v1.2.1 From 71e37f3cf25f14f87c581bf139a26fa8b6915aca Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Mon, 15 Aug 2005 08:44:36 +0000 Subject: *** empty log message *** --- src/ChangeLog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 1ac51d41a80..996175b2ff3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2005-08-15 Kim F. Storm + + * process.c (deactivate_process, status_notify, read_process_output) + (update_status, status_convert, decode_status, allocate_pty) + (make_process, remove_process, list_processes_1) + (create_process_1, unwind_request_sigio, read_process_output) + (send_process, keyboard_bit_set): Declare static. + (Fdelete_process): Simplify. Pass process to status_notify, so we + don't try to read output from it. + (status_notify): New arg deleting_process--don't try to read + output from that process. + + * lisp.h (deactivate_process, status_notify, read_process_output): + Remove prototypes. + 2005-08-14 Richard M. Stallman * image.c (syms_of_image): Init Qxbm, Qpbm before calling define_image_type. -- cgit v1.2.1 From ff6daed30415db8a1110e11f67f5d61ef02f04a5 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Mon, 15 Aug 2005 08:44:53 +0000 Subject: (deactivate_process, status_notify, read_process_output) (update_status, status_convert, decode_status, allocate_pty) (make_process, remove_process, list_processes_1) (create_process_1, unwind_request_sigio, read_process_output) (send_process, keyboard_bit_set): Declare static. (Fdelete_process): Simplify. Pass process to status_notify, so we don't try to read output from it. (status_notify): New arg deleting_process--don't try to read output from that process. --- src/process.c | 65 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/process.c b/src/process.c index c683e7b8516..18a446e9561 100644 --- a/src/process.c +++ b/src/process.c @@ -294,7 +294,10 @@ static Lisp_Object Vprocess_adaptive_read_buffering; #include "sysselect.h" -extern int keyboard_bit_set P_ ((SELECT_TYPE *)); +static int keyboard_bit_set P_ ((SELECT_TYPE *)); +static void deactivate_process P_ ((Lisp_Object)); +static void status_notify P_ ((struct Lisp_Process *)); +static int read_process_output P_ ((Lisp_Object, int)); /* If we support a window system, turn on the code to poll periodically to detect C-g. It isn't actually used when doing interrupt input. */ @@ -391,9 +394,9 @@ static char pty_name[24]; /* Compute the Lisp form of the process status, p->status, from the numeric status that was returned by `wait'. */ -Lisp_Object status_convert (); +static Lisp_Object status_convert (); -void +static void update_status (p) struct Lisp_Process *p; { @@ -407,7 +410,7 @@ update_status (p) /* Convert a process status word in Unix format to the list that we use internally. */ -Lisp_Object +static Lisp_Object status_convert (w) WAITTYPE w; { @@ -426,7 +429,7 @@ status_convert (w) /* Given a status-list, extract the three pieces of information and store them individually through the three pointers. */ -void +static void decode_status (l, symbol, code, coredump) Lisp_Object l; Lisp_Object *symbol; @@ -505,7 +508,7 @@ status_message (p) The file name of the terminal corresponding to the pty is left in the variable pty_name. */ -int +static int allocate_pty () { register int c, i; @@ -590,7 +593,7 @@ allocate_pty () } #endif /* HAVE_PTYS */ -Lisp_Object +static Lisp_Object make_process (name) Lisp_Object name; { @@ -634,7 +637,7 @@ make_process (name) return val; } -void +static void remove_process (proc) register Lisp_Object proc; { @@ -768,23 +771,27 @@ nil, indicating the current buffer's process. */) (process) register Lisp_Object process; { + register struct Lisp_Process *p; + process = get_process (process); - XPROCESS (process)->raw_status_low = Qnil; - XPROCESS (process)->raw_status_high = Qnil; - if (NETCONN_P (process)) + p = XPROCESS (process); + + p->raw_status_low = Qnil; + p->raw_status_high = Qnil; + if (NETCONN1_P (p)) { - XPROCESS (process)->status = Fcons (Qexit, Fcons (make_number (0), Qnil)); - XSETINT (XPROCESS (process)->tick, ++process_tick); - status_notify (); + p->status = Fcons (Qexit, Fcons (make_number (0), Qnil)); + XSETINT (p->tick, ++process_tick); + status_notify (p); } - else if (XINT (XPROCESS (process)->infd) >= 0) + else if (XINT (p->infd) >= 0) { Fkill_process (process, Qnil); /* Do this now, since remove_process will make sigchld_handler do nothing. */ - XPROCESS (process)->status + p->status = Fcons (Qsignal, Fcons (make_number (SIGKILL), Qnil)); - XSETINT (XPROCESS (process)->tick, ++process_tick); - status_notify (); + XSETINT (p->tick, ++process_tick); + status_notify (p); } remove_process (process); return Qnil; @@ -1238,7 +1245,7 @@ IP address. Returns nil if format of ADDRESS is invalid. */) } #endif -Lisp_Object +static Lisp_Object list_processes_1 (query_only) Lisp_Object query_only; { @@ -1708,7 +1715,7 @@ start_process_unwind (proc) return Qnil; } -void +static void create_process_1 (timer) struct atimer *timer; { @@ -2531,7 +2538,7 @@ OPTION is not a supported option, return nil instead; otherwise return t. */) /* A version of request_sigio suitable for a record_unwind_protect. */ -Lisp_Object +static Lisp_Object unwind_request_sigio (dummy) Lisp_Object dummy; { @@ -4222,7 +4229,7 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, /* It's okay for us to do this and then continue with the loop, since timeout has already been zeroed out. */ clear_waiting_for_input (); - status_notify (); + status_notify (NULL); } } @@ -4740,7 +4747,7 @@ read_process_output_error_handler (error) The characters read are decoded according to PROC's coding-system for decoding. */ -int +static int read_process_output (proc, channel) Lisp_Object proc; register int channel; @@ -5131,7 +5138,7 @@ send_process_trap () This function can evaluate Lisp code and can garbage collect. */ -void +static void send_process (proc, buf, len, object) volatile Lisp_Object proc; unsigned char *volatile buf; @@ -5725,7 +5732,7 @@ process_send_signal (process, signo, current_group, nomsg) p->status = Qrun; XSETINT (p->tick, ++process_tick); if (!nomsg) - status_notify (); + status_notify (NULL); break; #endif /* ! defined (SIGCONT) */ case SIGINT: @@ -6393,8 +6400,9 @@ exec_sentinel (proc, reason) This is usually done while Emacs is waiting for keyboard input but can be done at other times. */ -void -status_notify () +static void +status_notify (deleting_process) + struct Lisp_Process *deleting_process; { register Lisp_Object proc, buffer; Lisp_Object tail, msg; @@ -6430,6 +6438,7 @@ status_notify () && ! EQ (p->status, Qlisten) && ! EQ (p->command, Qt) /* Network process not stopped. */ && XINT (p->infd) >= 0 + && p != deleting_process && read_process_output (proc, XINT (p->infd)) > 0); buffer = p->buffer; @@ -6633,7 +6642,7 @@ delete_keyboard_wait_descriptor (desc) /* Return nonzero if *MASK has a bit set that corresponds to one of the keyboard input descriptors. */ -int +static int keyboard_bit_set (mask) SELECT_TYPE *mask; { -- cgit v1.2.1 From b74091648421da5ccc517cb3f404e3b9026d29a3 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Mon, 15 Aug 2005 08:45:04 +0000 Subject: (deactivate_process, status_notify, read_process_output): Remove prototypes. --- src/lisp.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/lisp.h b/src/lisp.h index 70f5ddffa94..65dd4cbcea6 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3026,12 +3026,9 @@ extern int wait_reading_process_output P_ ((int, int, int, int, Lisp_Object, struct Lisp_Process *, int)); -extern void deactivate_process P_ ((Lisp_Object)); extern void add_keyboard_wait_descriptor P_ ((int)); extern void delete_keyboard_wait_descriptor P_ ((int)); extern void close_process_descs P_ ((void)); -extern void status_notify P_ ((void)); -extern int read_process_output P_ ((Lisp_Object, int)); extern void init_process P_ ((void)); extern void syms_of_process P_ ((void)); extern void setup_process_coding_systems P_ ((Lisp_Object)); -- cgit v1.2.1 From 85c9ff2c64cf0803ded6d1be07ba132856449bc7 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Mon, 15 Aug 2005 12:22:43 +0000 Subject: (QUIT) [!SYNC_INPUT]: Throw t to Vthrow_on_input. --- src/lisp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lisp.h b/src/lisp.h index 65dd4cbcea6..3133ef23dac 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1813,7 +1813,7 @@ extern int interrupt_input_pending; Lisp_Object flag = Vquit_flag; \ Vquit_flag = Qnil; \ if (EQ (Vthrow_on_input, flag)) \ - Fthrow (Vthrow_on_input, Qnil); \ + Fthrow (Vthrow_on_input, Qt); \ Fsignal (Qquit, Qnil); \ } \ } while (0) -- cgit v1.2.1 From 0781c30389413e89ed51ff7aca05db18c6dec205 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Mon, 15 Aug 2005 12:29:38 +0000 Subject: *** empty log message *** --- src/ChangeLog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 996175b2ff3..f1086435540 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2005-08-15 Kim F. Storm + * lisp.h (QUIT) [!SYNC_INPUT]: Throw t to Vthrow_on_input. + * process.c (deactivate_process, status_notify, read_process_output) (update_status, status_convert, decode_status, allocate_pty) (make_process, remove_process, list_processes_1) -- cgit v1.2.1 From 2eca855f7a76273ab7a515479bb674b5349f3d7e Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 16 Aug 2005 01:34:06 +0000 Subject: (message3_nolog): Clear echo_message_buffer. --- src/xdisp.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/xdisp.c b/src/xdisp.c index 8cb4b38211f..3cc42ecdb28 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -7097,6 +7097,9 @@ message3_nolog (m, nbytes, multibyte) set_message (NULL, m, nbytes, multibyte); if (minibuffer_auto_raise) Fraise_frame (frame); + /* Assume we are not echoing. + (If we are, echo_now will override this.) */ + echo_message_buffer = Qnil; } else clear_message (1, 1); -- cgit v1.2.1 From 8d34b5e125667e8264c83120307b97c47c88c108 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 16 Aug 2005 02:32:05 +0000 Subject: *** empty log message *** --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index f1086435540..6d57df67964 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-08-15 Richard M. Stallman + + * xdisp.c (message3_nolog): Clear echo_message_buffer. + 2005-08-15 Kim F. Storm * lisp.h (QUIT) [!SYNC_INPUT]: Throw t to Vthrow_on_input. -- cgit v1.2.1 From ab89a403fadf48970d4ee86998b2ef3608d19dfc Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 16 Aug 2005 14:57:30 +0000 Subject: *** empty log message *** --- src/ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 6d57df67964..a744bd053e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2005-08-16 Kim F. Storm + + * dispnew.c (increment_row_positions): Skip non-enabled rows. + + * window.c (SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define. + (Fcurrent_window_configuration): Use VECSIZE macro instead. + 2005-08-15 Richard M. Stallman * xdisp.c (message3_nolog): Clear echo_message_buffer. -- cgit v1.2.1 From 5cacdcfdc7faf0af9d586a7e8a1f44f532c1aaa7 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 16 Aug 2005 14:58:16 +0000 Subject: (increment_row_positions): Skip non-enabled rows. --- src/dispnew.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/dispnew.c b/src/dispnew.c index a5057273bfe..3f7d55b2477 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1185,6 +1185,9 @@ increment_row_positions (row, delta, delta_bytes) MATRIX_ROW_END_CHARPOS (row) += delta; MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; + if (!row->enabled_p) + return; + /* Increment positions in glyphs. */ for (area = 0; area < LAST_AREA; ++area) for (i = 0; i < row->used[area]; ++i) -- cgit v1.2.1 From 8a450f0a7e90608a5f2165b580e60fc248f104a8 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 16 Aug 2005 14:58:33 +0000 Subject: (SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define. (Fcurrent_window_configuration): Use VECSIZE macro instead. --- src/window.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/window.c b/src/window.c index ccc3cdfa761..36d0c89bc43 100644 --- a/src/window.c +++ b/src/window.c @@ -5624,8 +5624,6 @@ struct saved_window Lisp_Object scroll_bar_width, vertical_scroll_bar_type; }; -#define SAVED_WINDOW_VECTOR_SIZE 24 /* Arg to Fmake_vector */ - #define SAVED_WINDOW_N(swv,n) \ ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) @@ -6205,7 +6203,7 @@ redirection (see `redirect-frame-focus'). */) data->saved_windows = tem; for (i = 0; i < n_windows; i++) XVECTOR (tem)->contents[i] - = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil); + = Fmake_vector (make_number (VECSIZE (struct saved_window)), Qnil); save_window_save (FRAME_ROOT_WINDOW (f), XVECTOR (tem), 0); XSETWINDOW_CONFIGURATION (tem, data); return (tem); -- cgit v1.2.1 From 5dec4320267af6aaaaa37cc210e43839d6c30c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 16 Aug 2005 19:33:07 +0000 Subject: * gtkutil.h (xg_set_frame_icon): Declare it. --- src/gtkutil.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gtkutil.h b/src/gtkutil.h index a97c1b5ca8a..aea4ee9e7cf 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -199,9 +199,9 @@ extern void x_wm_set_size_hint P_ ((FRAME_PTR f, int user_position)); extern void xg_set_background_color P_ ((FRAME_PTR f, unsigned long bg)); -extern GdkPixbuf * xg_get_pixbuf_from_pix_and_mask P_ ((GdkPixmap *gpix, - GdkPixmap *gmask, - GdkColormap *cmap)); +extern void xg_set_frame_icon P_ ((FRAME_PTR f, + Pixmap icon_pixmap, + Pixmap icon_mask)); /* Mark all callback data that are Lisp_object:s during GC. */ extern void xg_mark_data P_ ((void)); -- cgit v1.2.1 From 1001243b675d98e2d22636a5ac4628c80a3a84a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 16 Aug 2005 19:33:40 +0000 Subject: * gtkutil.c (xg_set_frame_icon): New function. --- src/gtkutil.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gtkutil.c b/src/gtkutil.c index 0e0f6cd898a..3b590e0faed 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -241,7 +241,7 @@ xg_create_default_cursor (dpy) /* Apply GMASK to GPIX and return a GdkPixbuf with an alpha channel. */ -GdkPixbuf * +static GdkPixbuf * xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap) GdkPixmap *gpix; GdkPixmap *gmask; @@ -952,6 +952,24 @@ xg_set_background_color (f, bg) } +/* Set the frame icon to ICON_PIXMAP/MASK. This must be done with GTK + functions so GTK does not overwrite the icon. */ + +void +xg_set_frame_icon (f, icon_pixmap, icon_mask) + FRAME_PTR f; + Pixmap icon_pixmap; + Pixmap icon_mask; +{ + GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); + GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap); + GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask); + GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL); + + gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp); +} + + /*********************************************************************** Dialog functions -- cgit v1.2.1 From e76738f9622c1351364548c8326aa82190b17fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 16 Aug 2005 19:34:00 +0000 Subject: * xterm.c (x_wm_set_icon_pixmap): Move GTK specific code to xg_set_frame_icon and call it. --- src/xterm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src') diff --git a/src/xterm.c b/src/xterm.c index 84b1dae3515..9fd511934a6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9253,12 +9253,7 @@ x_wm_set_icon_pixmap (f, pixmap_id) #ifdef USE_GTK { - GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); - GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap); - GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask); - GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL); - - gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp); + xg_set_frame_icon (f, icon_pixmap, icon_mask); return; } -- cgit v1.2.1 From ada192bab1e72a77191e709d2e4d8156eec134c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 16 Aug 2005 19:34:25 +0000 Subject: * xterm.c (x_wm_set_icon_pixmap): Move GTK specific code to xg_set_frame_icon and call it. * gtkutil.c (xg_set_frame_icon): New function. * gtkutil.h (xg_set_frame_icon): Declare it. --- src/ChangeLog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index a744bd053e1..004221e0f02 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2005-08-16 Jan Dj,Ad(Brv + + * xterm.c (x_wm_set_icon_pixmap): Move GTK specific code to + xg_set_frame_icon and call it. + + * gtkutil.c (xg_set_frame_icon): New function. + + * gtkutil.h (xg_set_frame_icon): Declare it. + 2005-08-16 Kim F. Storm * dispnew.c (increment_row_positions): Skip non-enabled rows. -- cgit v1.2.1 From 69036b87bb3c5aa2beff7440a05dcbae5d7b2d41 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 17 Aug 2005 14:59:41 +0000 Subject: (pos_visible_p): Adjust X value if window is hscrolled. --- src/xdisp.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/xdisp.c b/src/xdisp.c index 3cc42ecdb28..9b5b7edf035 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1347,6 +1347,9 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p) current_header_line_height = current_mode_line_height = -1; + if (visible_p && w->hscroll > 0) + *x -= w->hscroll; + return visible_p; } -- cgit v1.2.1 From b70d98e13c27b14e12ce4cef9cd9c8758f6fff0a Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 17 Aug 2005 15:00:14 +0000 Subject: (buffer_posn_from_coords): Check that target row is within matrix. --- src/dispnew.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/dispnew.c b/src/dispnew.c index 3f7d55b2477..15190abfb7e 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5801,8 +5801,9 @@ buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) } #endif - row = MATRIX_ROW (w->current_matrix, it.vpos); - if (row->enabled_p) + if (it.vpos < w->current_matrix->nrows + && (row = MATRIX_ROW (w->current_matrix, it.vpos), + row->enabled_p)) { if (it.hpos < row->used[TEXT_AREA]) { -- cgit v1.2.1 From 0eefa6fbb54b3f1ca937ca7db3ccc06967c4e656 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 17 Aug 2005 15:02:41 +0000 Subject: *** empty log message *** --- src/ChangeLog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 004221e0f02..0a1d3394932 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2005-08-17 Kim F. Storm + + * xdisp.c (pos_visible_p): Adjust X value if window is hscrolled. + + * dispnew.c (buffer_posn_from_coords): Check that target row is + within matrix. + 2005-08-16 Jan Dj,Ad(Brv * xterm.c (x_wm_set_icon_pixmap): Move GTK specific code to @@ -5,7 +12,7 @@ * gtkutil.c (xg_set_frame_icon): New function. - * gtkutil.h (xg_set_frame_icon): Declare it. + * gtkutil.h (xg_set_frame_icon): Declare it. 2005-08-16 Kim F. Storm -- cgit v1.2.1 From 581360f07f054330644645a46b06c7b26dd9cfce Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Thu, 18 Aug 2005 11:31:04 +0000 Subject: *** empty log message *** --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 0a1d3394932..d568243a0e7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-08-18 Kim F. Storm + + * xdisp.c (calc_pixel_width_or_height): Use actual display + resolution when available instead of Vdisplay_pixels_per_inch. + 2005-08-17 Kim F. Storm * xdisp.c (pos_visible_p): Adjust X value if window is hscrolled. -- cgit v1.2.1 From c0d7caba9977215cadc057d290f3780e86ca636f Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Thu, 18 Aug 2005 11:31:22 +0000 Subject: (calc_pixel_width_or_height): Use actual display resolution when available instead of Vdisplay_pixels_per_inch. --- src/xdisp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/xdisp.c b/src/xdisp.c index 9b5b7edf035..6ed5fd151d6 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -17622,6 +17622,15 @@ calc_pixel_width_or_height (res, it, prop, font, width_p, align_to) if (pixels > 0) { double ppi; +#ifdef HAVE_WINDOW_SYSTEM + if (FRAME_WINDOW_P (it->f) + && (ppi = (width_p + ? FRAME_X_DISPLAY_INFO (it->f)->resx + : FRAME_X_DISPLAY_INFO (it->f)->resy), + ppi > 0)) + return OK_PIXELS (ppi / pixels); +#endif + if ((ppi = NUMVAL (Vdisplay_pixels_per_inch), ppi > 0) || (CONSP (Vdisplay_pixels_per_inch) && (ppi = (width_p @@ -23056,7 +23065,7 @@ of the top or bottom of the window. */); scroll_margin = 0; DEFVAR_LISP ("display-pixels-per-inch", &Vdisplay_pixels_per_inch, - doc: /* Pixels per inch on current display. + doc: /* Pixels per inch value for non-window system displays. Value is a number or a cons (WIDTH-DPI . HEIGHT-DPI). */); Vdisplay_pixels_per_inch = make_float (72.0); -- cgit v1.2.1 From 40b388f98ce27057cff72ff65fc3ee91a2e7344d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 20 Aug 2005 05:26:27 +0000 Subject: (display_echo_area_1): Get display start pos from w->start. (resize_mini_window): Set w->start, and PT, so as to display the tail end of the buffer, if it doesn't all fit. --- src/ChangeLog | 6 ++++++ src/xdisp.c | 25 ++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index d568243a0e7..7bc84cfbdbf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-08-20 Richard M. Stallman + + * xdisp.c (display_echo_area_1): Get display start pos from w->start. + (resize_mini_window): Set w->start, and PT, so as to display the tail + end of the buffer, if it doesn't all fit. + 2005-08-18 Kim F. Storm * xdisp.c (calc_pixel_width_or_height): Use actual display diff --git a/src/xdisp.c b/src/xdisp.c index 6ed5fd151d6..3a4f3f001ab 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -7631,13 +7631,16 @@ display_echo_area_1 (a1, a2, a3, a4) int window_height_changed_p = 0; /* Do this before displaying, so that we have a large enough glyph - matrix for the display. */ + matrix for the display. If we can't get enough space for the + whole text, display the last N lines. That works by setting w->start. */ window_height_changed_p = resize_mini_window (w, 0); + /* Use the starting position chosen by resize_mini_window. */ + SET_TEXT_POS_FROM_MARKER (start, w->start); + /* Display. */ clear_glyph_matrix (w->desired_matrix); XSETWINDOW (window, w); - SET_TEXT_POS (start, BEG, BEG_BYTE); try_window (window, start, 0); return window_height_changed_p; @@ -7693,8 +7696,14 @@ resize_mini_window_1 (a1, exactly, a3, a4) /* Resize mini-window W to fit the size of its contents. EXACT:P means size the window exactly to the size needed. Otherwise, it's - only enlarged until W's buffer is empty. Value is non-zero if - the window height has been changed. */ + only enlarged until W's buffer is empty. + + Set W->start to the right place to begin display. If the whole + contents fit, start at the beginning. Otherwise, start so as + to make the end of the contents appear. This is particularly + important for y-or-n-p, but seems desirable generally. + + Value is non-zero if the window height has been changed. */ int resize_mini_window (w, exact_p) @@ -7706,6 +7715,11 @@ resize_mini_window (w, exact_p) xassert (MINI_WINDOW_P (w)); + /* By default, start display at the beginning. */ + set_marker_both (w->start, w->buffer, + BUF_BEGV (XBUFFER (w->buffer)), + BUF_BEGV_BYTE (XBUFFER (w->buffer))); + /* Don't resize windows while redisplaying a window; it would confuse redisplay functions when the size of the window they are displaying changes from under them. Such a resizing can happen, @@ -7769,9 +7783,10 @@ resize_mini_window (w, exact_p) if (height > max_height) { height = max_height; - init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); + init_iterator (&it, w, ZV, ZV_BYTE, NULL, DEFAULT_FACE_ID); move_it_vertically_backward (&it, (height - 1) * unit); start = it.current.pos; + SET_PT_BOTH (CHARPOS (start), BYTEPOS (start)); } else SET_TEXT_POS (start, BEGV, BEGV_BYTE); -- cgit v1.2.1 From 7c3f805b803e3636995d1a6a054fe08ec4591ee5 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sun, 21 Aug 2005 20:56:35 +0000 Subject: *** empty log message *** --- src/ChangeLog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 7bc84cfbdbf..744b1ebbcee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2005-08-21 Kim F. Storm + + * fringe.c (update_window_fringes): Replace FORCE_P arg with + KEEP_CURRENT_P arg; if non-zero, don't update current row fringes, + and return 0. + + * xdisp.c (redisplay_window): Call update_window_fringes with + KEEP_CURRENT_P non-0 if we are going to refresh fringes later. + 2005-08-20 Richard M. Stallman * xdisp.c (display_echo_area_1): Get display start pos from w->start. -- cgit v1.2.1 From 4dadc1297ba91d58d2eb20d88174456cb858c3cf Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sun, 21 Aug 2005 20:57:42 +0000 Subject: (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg; if non-zero, don't update current row fringes, and return 0. --- src/fringe.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/fringe.c b/src/fringe.c index f9120d4c74b..4b715844084 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -777,13 +777,14 @@ draw_window_fringes (w, no_fringe) /* Recalculate the bitmaps to show in the fringes of window W. - If FORCE_P is 0, only mark rows with modified bitmaps for update in - redraw_fringe_bitmaps_p; else mark all rows for update. */ + Only mark rows with modified bitmaps for update in redraw_fringe_bitmaps_p. + + If KEEP_CURRENT_P is 0, update current_matrix too. */ int -update_window_fringes (w, force_p) +update_window_fringes (w, keep_current_p) struct window *w; - int force_p; + int keep_current_p; { struct glyph_row *row, *cur = 0; int yb = window_text_bottom_y (w); @@ -943,8 +944,7 @@ update_window_fringes (w, force_p) else right = NO_FRINGE_BITMAP; - if (force_p - || row->y != cur->y + if (row->y != cur->y || row->visible_height != cur->visible_height || row->ends_at_zv_p != cur->ends_at_zv_p || left != cur->left_fringe_bitmap @@ -953,11 +953,15 @@ update_window_fringes (w, force_p) || right_face_id != cur->right_fringe_face_id || cur->redraw_fringe_bitmaps_p) { - redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1; - cur->left_fringe_bitmap = left; - cur->right_fringe_bitmap = right; - cur->left_fringe_face_id = left_face_id; - cur->right_fringe_face_id = right_face_id; + redraw_p = row->redraw_fringe_bitmaps_p = 1; + if (!keep_current_p) + { + cur->redraw_fringe_bitmaps_p = 1; + cur->left_fringe_bitmap = left; + cur->right_fringe_bitmap = right; + cur->left_fringe_face_id = left_face_id; + cur->right_fringe_face_id = right_face_id; + } } if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap) @@ -975,7 +979,7 @@ update_window_fringes (w, force_p) row[-1].redraw_fringe_bitmaps_p = cur[-1].redraw_fringe_bitmaps_p = 1; } - return redraw_p; + return redraw_p && !keep_current_p; } -- cgit v1.2.1 From 61d6a05830dfbf4d3ea0d811560ccdaa56459786 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sun, 21 Aug 2005 20:58:03 +0000 Subject: (redisplay_window): Call update_window_fringes with KEEP_CURRENT_P non-0 if we are going to refresh fringes later. --- src/xdisp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/xdisp.c b/src/xdisp.c index 3a4f3f001ab..83483039b54 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -12730,10 +12730,9 @@ redisplay_window (window, just_this_one_p) #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f) - && update_window_fringes (w, 0) - && !just_this_one_p - && (used_current_matrix_p || overlay_arrow_seen) - && !w->pseudo_window_p) + && update_window_fringes (w, (just_this_one_p + || (!used_current_matrix_p && !overlay_arrow_seen) + || w->pseudo_window_p))) { update_begin (f); BLOCK_INPUT; -- cgit v1.2.1 From 0f467468635307820479fa9117fe5c78291e8611 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sun, 21 Aug 2005 21:47:55 +0000 Subject: *** empty log message *** --- src/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 744b1ebbcee..ea699d1c036 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2005-08-21 Kim F. Storm + * fringe.c (update_window_fringes): Only put TOP and BOTTOM + bitmaps on fully visible rows. + * fringe.c (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg; if non-zero, don't update current row fringes, and return 0. -- cgit v1.2.1 From 18e1c39a823331377f538410041576140eec15ea Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sun, 21 Aug 2005 21:48:22 +0000 Subject: * fringe.c (update_window_fringes): Only put TOP and BOTTOM bitmaps on fully visible rows. --- src/fringe.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/fringe.c b/src/fringe.c index 4b715844084..754ee68ca56 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -850,7 +850,8 @@ update_window_fringes (w, keep_current_p) { if (!done_top) { - if (MATRIX_ROW_START_CHARPOS (row) <= BUF_BEGV (XBUFFER (w->buffer))) + if (MATRIX_ROW_START_CHARPOS (row) <= BUF_BEGV (XBUFFER (w->buffer)) + && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) row->indicate_bob_p = !NILP (boundary_top); else row->indicate_top_line_p = !NILP (arrow_top); @@ -859,7 +860,8 @@ update_window_fringes (w, keep_current_p) if (!done_bot) { - if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer))) + if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer)) + && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1; else if (y + row->height >= yb) row->indicate_bottom_line_p = !NILP (arrow_bot), done_bot = 1; -- cgit v1.2.1 From 753d161b0fa178327493c373de9d8777240c28cd Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 22 Aug 2005 20:47:49 +0000 Subject: (turn_on_face): Check for TS_set_foreground and TS_set_background depending on standout_mode. Simplify. --- src/term.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/term.c b/src/term.c index 76cf2e2c6f0..2b4ea7e23a4 100644 --- a/src/term.c +++ b/src/term.c @@ -2011,24 +2011,20 @@ turn_on_face (f, face_id) if (TN_max_colors > 0) { - char *p; + char *ts, *p; - if (fg >= 0 && TS_set_foreground) + ts = standout_mode ? TS_set_background : TS_set_foreground; + if (fg >= 0 && ts) { - if (standout_mode) - p = tparam (TS_set_background, NULL, 0, (int) fg); - else - p = tparam (TS_set_foreground, NULL, 0, (int) fg); + p = tparam (ts, NULL, 0, (int) fg); OUTPUT (p); xfree (p); } - if (bg >= 0 && TS_set_background) + ts = standout_mode ? TS_set_foreground : TS_set_background; + if (bg >= 0 && ts) { - if (standout_mode) - p = tparam (TS_set_foreground, NULL, 0, (int) bg); - else - p = tparam (TS_set_background, NULL, 0, (int) bg); + p = tparam (ts, NULL, 0, (int) bg); OUTPUT (p); xfree (p); } -- cgit v1.2.1 From 16691d29c144224aba088319fece5bac687f2dc8 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 22 Aug 2005 21:35:40 +0000 Subject: *** empty log message *** --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index ea699d1c036..8ed2fd4c674 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-08-22 Juri Linkov + + * term.c (turn_on_face): Check for TS_set_foreground and + TS_set_background depending on standout_mode. Simplify. + 2005-08-21 Kim F. Storm * fringe.c (update_window_fringes): Only put TOP and BOTTOM -- cgit v1.2.1 From fca32d15e29e4817856e2e380433cc2b79e8f39c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Thu, 25 Aug 2005 08:20:12 +0000 Subject: (kbd_buffer_get_event) [MAC_OS]: Make events for ICONIFY/DEICONIFY_EVENT. --- src/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/keyboard.c b/src/keyboard.c index e9a51bbeeb4..a39e2699d5f 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4002,7 +4002,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu) kbd_fetch_ptr = event + 1; } #endif -#if defined (HAVE_X11) || defined (HAVE_NTGUI) +#if defined (HAVE_X11) || defined (HAVE_NTGUI) || defined (MAC_OS) else if (event->kind == ICONIFY_EVENT) { /* Make an event (iconify-frame (FRAME)). */ -- cgit v1.2.1 From 1f98fbb49f5d2767da43fe1cc45d521c8c660034 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Thu, 25 Aug 2005 08:20:43 +0000 Subject: (mac_copy_area, mac_copy_area_with_mask): Restore background color. (mac_handle_visibility_change): New function. (x_make_frame_invisible, x_iconify_frame) (XTread_socket) [!USE_CARBON_EVENTS]: Use it. [USE_CARBON_EVENTS] (mac_handle_window_event) (install_window_handler): Handle visibilty change events. (x_make_frame_visible): Don't reposition window if it is iconified or asked for visible before. Select and uncollapse window when it is made visible. (x_make_frame_invisible): Don't reset x_highlight_frame. (x_iconify_frame): Likewise. Make invisible frame visible before it is iconified. (read_socket_inev): Move variable outside #if USE_CARBON_EVENTS. (do_window_update): Don't change visibility of invisible frame. --- src/ChangeLog | 21 ++++++ src/macterm.c | 206 +++++++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 174 insertions(+), 53 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 8ed2fd4c674..7223826cd08 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,24 @@ +2005-08-25 YAMAMOTO Mitsuharu + + * keyboard.c (kbd_buffer_get_event) [MAC_OS]: Make events for + ICONIFY/DEICONIFY_EVENT. + + * macterm.c (mac_copy_area, mac_copy_area_with_mask): Restore + background color. + (mac_handle_visibility_change): New function. + (x_make_frame_invisible, x_iconify_frame) + (XTread_socket) [!USE_CARBON_EVENTS]: Use it. + [USE_CARBON_EVENTS] (mac_handle_window_event) + (install_window_handler): Handle visibilty change events. + (x_make_frame_visible): Don't reposition window if it is iconified + or asked for visible before. Select and uncollapse window when it + is made visible. + (x_make_frame_invisible): Don't reset x_highlight_frame. + (x_iconify_frame): Likewise. Make invisible frame visible before + it is iconified. + (read_socket_inev): Move variable outside #if USE_CARBON_EVENTS. + (do_window_update): Don't change visibility of invisible frame. + 2005-08-22 Juri Linkov * term.c (turn_on_face): Check for TS_set_foreground and diff --git a/src/macterm.c b/src/macterm.c index fd76e164d49..3c7af5f1cef 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -796,6 +796,8 @@ mac_copy_area (display, src, dest, gc, src_x, src_y, width, height, dest_x, &src_r, &dest_r, srcCopy, 0); #endif /* not TARGET_API_MAC_CARBON */ UnlockPixels (GetGWorldPixMap (src)); + + RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (dest))); } @@ -834,6 +836,8 @@ mac_copy_area_with_mask (display, src, mask, dest, gc, src_x, src_y, #endif /* not TARGET_API_MAC_CARBON */ UnlockPixels (GetGWorldPixMap (mask)); UnlockPixels (GetGWorldPixMap (src)); + + RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (dest))); } @@ -5646,6 +5650,53 @@ XTframe_raise_lower (f, raise_flag) /* Change of visibility. */ +static void +mac_handle_visibility_change (f) + struct frame *f; +{ + WindowPtr wp = FRAME_MAC_WINDOW (f); + int visible = 0, iconified = 0; + struct input_event buf; + + if (IsWindowVisible (wp)) + if (IsWindowCollapsed (wp)) + iconified = 1; + else + visible = 1; + + if (!f->async_visible && visible) + { + if (f->iconified) + { + /* wait_reading_process_output will notice this and update + the frame's display structures. If we were made + invisible, we should not set garbaged, because that stops + redrawing on Update events. */ + SET_FRAME_GARBAGED (f); + + EVENT_INIT (buf); + buf.kind = DEICONIFY_EVENT; + XSETFRAME (buf.frame_or_window, f); + kbd_buffer_store_event (&buf); + } + else if (! NILP (Vframe_list) && ! NILP (XCDR (Vframe_list))) + /* Force a redisplay sooner or later to update the + frame titles in case this is the second frame. */ + record_asynch_buffer_change (); + } + else if (f->async_visible && !visible) + if (iconified) + { + EVENT_INIT (buf); + buf.kind = ICONIFY_EVENT; + XSETFRAME (buf.frame_or_window, f); + kbd_buffer_store_event (&buf); + } + + f->async_visible = visible; + f->async_iconified = iconified; +} + /* This tries to wait until the frame is really visible. However, if the window manager asks the user where to position the frame, this will return before the user finishes doing that. @@ -5670,29 +5721,32 @@ x_make_frame_visible (f) before the window gets really visible. */ if (! FRAME_ICONIFIED_P (f) && ! f->output_data.mac->asked_for_visible) - x_set_offset (f, f->left_pos, f->top_pos, 0); - - f->output_data.mac->asked_for_visible = 1; - #if TARGET_API_MAC_CARBON - if (!(FRAME_SIZE_HINTS (f)->flags & (USPosition | PPosition))) - { - struct frame *sf = SELECTED_FRAME (); - if (!FRAME_MAC_P (sf)) - RepositionWindow (FRAME_MAC_WINDOW (f), NULL, - kWindowCenterOnMainScreen); - else - RepositionWindow (FRAME_MAC_WINDOW (f), - FRAME_MAC_WINDOW (sf), + if (!(FRAME_SIZE_HINTS (f)->flags & (USPosition | PPosition))) + { + struct frame *sf = SELECTED_FRAME (); + if (!FRAME_MAC_P (sf)) + RepositionWindow (FRAME_MAC_WINDOW (f), NULL, + kWindowCenterOnMainScreen); + else + RepositionWindow (FRAME_MAC_WINDOW (f), + FRAME_MAC_WINDOW (sf), #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 - kWindowCascadeStartAtParentWindowScreen + kWindowCascadeStartAtParentWindowScreen #else - kWindowCascadeOnParentWindowScreen + kWindowCascadeOnParentWindowScreen #endif - ); - x_real_positions (f, &f->left_pos, &f->top_pos); - } + ); + x_real_positions (f, &f->left_pos, &f->top_pos); + } + else #endif + x_set_offset (f, f->left_pos, f->top_pos, 0); + + f->output_data.mac->asked_for_visible = 1; + + SelectWindow (FRAME_MAC_WINDOW (f)); + CollapseWindow (FRAME_MAC_WINDOW (f), false); ShowWindow (FRAME_MAC_WINDOW (f)); } @@ -5751,9 +5805,14 @@ void x_make_frame_invisible (f) struct frame *f; { + /* A deactivate event does not occur when the last visible frame is + made invisible. So if we clear the highlight here, it will not + be rehighlighted when it is made visible. */ +#if 0 /* Don't keep the highlight on an invisible frame. */ if (FRAME_MAC_DISPLAY_INFO (f)->x_highlight_frame == f) FRAME_MAC_DISPLAY_INFO (f)->x_highlight_frame = 0; +#endif BLOCK_INPUT; @@ -5766,17 +5825,11 @@ x_make_frame_invisible (f) HideWindow (FRAME_MAC_WINDOW (f)); - /* We can't distinguish this from iconification - just by the event that we get from the server. - So we can't win using the usual strategy of letting - FRAME_SAMPLE_VISIBILITY set this. So do it by hand, - and synchronize with the server to make sure we agree. */ - f->visible = 0; - FRAME_ICONIFIED_P (f) = 0; - f->async_visible = 0; - f->async_iconified = 0; - UNBLOCK_INPUT; + +#if !USE_CARBON_EVENTS + mac_handle_visibility_change (f); +#endif } /* Change window state from mapped to iconified. */ @@ -5785,21 +5838,37 @@ void x_iconify_frame (f) struct frame *f; { + OSErr err; + + /* A deactivate event does not occur when the last visible frame is + iconified. So if we clear the highlight here, it will not be + rehighlighted when it is deiconified. */ +#if 0 /* Don't keep the highlight on an invisible frame. */ if (FRAME_MAC_DISPLAY_INFO (f)->x_highlight_frame == f) FRAME_MAC_DISPLAY_INFO (f)->x_highlight_frame = 0; +#endif -#if 0 - /* Review: Since window is still visible in dock, still allow updates? */ if (f->async_iconified) return; -#endif BLOCK_INPUT; - CollapseWindow (FRAME_MAC_WINDOW (f), true); + FRAME_SAMPLE_VISIBILITY (f); + + if (! FRAME_VISIBLE_P (f)) + ShowWindow (FRAME_MAC_WINDOW (f)); + + err = CollapseWindow (FRAME_MAC_WINDOW (f), true); UNBLOCK_INPUT; + + if (err != noErr) + error ("Can't notify window manager of iconification"); + +#if !USE_CARBON_EVENTS + mac_handle_visibility_change (f); +#endif } @@ -7188,7 +7257,7 @@ x_load_font (f, fontname, size) /* Set global flag fonts_changed_p to non-zero if the font loaded has a character with a smaller width than any other character - before, or if the font loaded has a smalle>r height than any + before, or if the font loaded has a smaller height than any other font loaded before. If this happens, it will make a glyph matrix reallocation necessary. */ fonts_changed_p |= x_compute_min_glyph_bounds (f); @@ -7319,12 +7388,12 @@ Lisp_Object Vmac_pass_command_to_system; /* If Non-nil, the Mac "Control" key is passed on to the Mac Toolbox for processing before Emacs sees it. */ Lisp_Object Vmac_pass_control_to_system; +#endif /* Points to the variable `inev' in the function XTread_socket. It is used for passing an input event to the function back from Carbon/Apple event handlers. */ static struct input_event *read_socket_inev = NULL; -#endif /* Set in term/mac-win.el to indicate that event loop can now generate drag and drop events. */ @@ -7609,37 +7678,30 @@ do_window_update (WindowPtr win) { if (f->async_visible == 0) { + /* Update events may occur when a frame gets iconified. */ +#if 0 f->async_visible = 1; f->async_iconified = 0; SET_FRAME_GARBAGED (f); - - /* An update event is equivalent to MapNotify on X, so report - visibility changes properly. */ - if (! NILP(Vframe_list) && ! NILP (XCDR (Vframe_list))) - /* Force a redisplay sooner or later to update the - frame titles in case this is the second frame. */ - record_asynch_buffer_change (); +#endif } else - { + { Rect r; - #if TARGET_API_MAC_CARBON - { - RgnHandle region = NewRgn (); + RgnHandle region = NewRgn (); - GetPortVisibleRegion (GetWindowPort (win), region); - GetRegionBounds (region, &r); - expose_frame (f, r.left, r.top, r.right - r.left, r.bottom - r.top); - UpdateControls (win, region); - DisposeRgn (region); - } + GetPortVisibleRegion (GetWindowPort (win), region); + GetRegionBounds (region, &r); + expose_frame (f, r.left, r.top, r.right - r.left, r.bottom - r.top); + UpdateControls (win, region); + DisposeRgn (region); #else r = (*win->visRgn)->rgnBBox; expose_frame (f, r.left, r.top, r.right - r.left, r.bottom - r.top); UpdateControls (win, win->visRgn); #endif - } + } } EndUpdate (win); @@ -8171,6 +8233,17 @@ mac_handle_window_event (next_handler, event, data) return noErr; } break; + + case kEventWindowShown: + case kEventWindowHidden: + case kEventWindowExpanded: + case kEventWindowCollapsed: + result = CallNextEventHandler (next_handler, event); + + mac_handle_visibility_change (mac_window_to_frame (wp)); + return noErr; + + break; } return eventNotHandledErr; @@ -8246,7 +8319,11 @@ install_window_handler (window) #if USE_CARBON_EVENTS EventTypeSpec specs_window[] = {{kEventClassWindow, kEventWindowUpdate}, - {kEventClassWindow, kEventWindowBoundsChanging}}; + {kEventClassWindow, kEventWindowBoundsChanging}, + {kEventClassWindow, kEventWindowShown}, + {kEventClassWindow, kEventWindowHidden}, + {kEventClassWindow, kEventWindowExpanded}, + {kEventClassWindow, kEventWindowCollapsed}}; EventTypeSpec specs_mouse[] = {{kEventClassMouse, kEventMouseWheelMoved}}; static EventHandlerUPP handle_window_eventUPP = NULL; static EventHandlerUPP handle_mouse_eventUPP = NULL; @@ -9455,6 +9532,29 @@ XTread_socket (sd, expected, hold_quit) pending_autoraise_frame = 0; } +#if !USE_CARBON_EVENTS + /* Check which frames are still visible. We do this here because + there doesn't seem to be any direct notification from the Window + Manager that the visibility of a window has changed (at least, + not in all cases). */ + { + Lisp_Object tail, frame; + + FOR_EACH_FRAME (tail, frame) + { + struct frame *f = XFRAME (frame); + + /* The tooltip has been drawn already. Avoid the + SET_FRAME_GARBAGED in mac_handle_visibility_change. */ + if (EQ (frame, tip_frame)) + continue; + + if (FRAME_MAC_P (f)) + mac_handle_visibility_change (f); + } + } +#endif + UNBLOCK_INPUT; return count; } -- cgit v1.2.1