diff options
| author | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
| commit | 380874900ca183ec2fdce91949d841328852d7a8 (patch) | |
| tree | 6918a4182f8657251e83223511aa7827fb8820ed /src | |
| parent | 72b464afc12a7532fc8555352db04c65647c15ae (diff) | |
| parent | c96ec15a58817ac97db5348187e2d8695f609cb5 (diff) | |
| download | emacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 43-57)
- Update from CVS
- Merge from erc--emacs--0
- Make constrain-to-field notice overlays
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 18-21)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'src')
285 files changed, 434 insertions, 318 deletions
diff --git a/src/.gdbinit b/src/.gdbinit index 7c04aae8a78..3f5565aee40 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -1,5 +1,5 @@ -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, +# 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/ChangeLog b/src/ChangeLog index dc6a1641ac5..73436b217a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,38 @@ +2006-02-08 Miles Bader <miles@gnu.org> + + * editfns.c (Fconstrain_to_field): Use Fget_char_property instead + of Fget_text_property (other field functions word with overlays as + well as text-properties). + +2006-02-07 Kenichi Handa <handa@m17n.org> + + * dispextern.h (unibyte_display_via_language_environment): Extern it. + + * xterm.h (unibyte_display_via_language_environment): + * w32term.h (unibyte_display_via_language_environment): + * macterm.h (unibyte_display_via_language_environment): Delete extern. + +2006-02-07 Kenichi Handa <handa@m17n.org> + + * term.c (append_glyph): Refer to it->char_to_display instead of it->c. + (produce_glyphs): Set the character to print in + it->char_to_display. Handle unibyte-display-via-language-environment. + (produce_stretch_glyph): Set character to print in it->char_to_display. + +2006-02-06 Kenichi Handa <handa@m17n.org> + + * lread.c (openp): Initialize encoded_fn before GCPRO it. + +2006-02-05 Ken Raeburn <raeburn@raeburn.org> + + * editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup. + + * lisp.h (XPNTR) [!NO_UNION_TYPE && !HAVE_SHM && !DATA_SEG_BITS]: + Cast bitfield value to EMACS_INT, to suppress gcc warning. + + * xrdb.c (malloc, realloc, free) [emacs]: Undefine macros before + defining. + 2006-02-03 Kim F. Storm <storm@cua.dk> * xdisp.c: Cache last merged escape glyph face. @@ -22394,7 +22429,8 @@ See ChangeLog.9 for earlier changes. ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/src/Makefile.in b/src/Makefile.in index fafd930a972..3be09cac3ea 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ # Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/src/abbrev.c b/src/abbrev.c index a62a3a23037..13da66f5801 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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.c b/src/atimer.c index d260f67d24d..8b092270d7b 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -1,5 +1,6 @@ /* Asynchronous timers. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.h b/src/atimer.h index d5ad9c674d5..84b1383ffdf 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -1,5 +1,6 @@ /* Asynchronous timers. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/blockinput.h b/src/blockinput.h index 0eaebbe34df..78dce69fe1f 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -1,6 +1,6 @@ /* blockinput.h - interface to blocking complicated interrupt-driven input. Copyright (C) 1989, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.c b/src/buffer.c index adcd03127da..4dce7c40686 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,7 +1,7 @@ /* Buffer manipulation primitives for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.h b/src/buffer.h index 3250967c5a8..a82f9578ff9 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, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/bytecode.c b/src/bytecode.c index 4a10d6091e7..e6f84cc6c2b 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, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callint.c b/src/callint.c index 5979e495ac3..4789fb5582d 100644 --- a/src/callint.c +++ b/src/callint.c @@ -1,6 +1,6 @@ /* Call a Lisp function interactively. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callproc.c b/src/callproc.c index 9e7ab915a97..54ebf53979e 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, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casefiddle.c b/src/casefiddle.c index 04ec1d32284..ba9b3e3adf4 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -1,6 +1,6 @@ /* GNU Emacs case conversion functions. Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casetab.c b/src/casetab.c index cccc7d24084..89f9287c75f 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -1,6 +1,6 @@ /* GNU Emacs routines to deal with case tables. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/category.c b/src/category.c index 3f4a9dd83f4..9b47e6c00e9 100644 --- a/src/category.c +++ b/src/category.c @@ -1,5 +1,5 @@ /* GNU Emacs routines to deal with category tables. - Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 1999 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/ccl.c b/src/ccl.c index 301cf010ba1..743fbae21e5 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1,5 +1,6 @@ /* CCL (Code Conversion Language) interpreter. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/charset.c b/src/charset.c index 15a5d75ecbd..3e1bebdd68f 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1,5 +1,6 @@ /* Basic character set support. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/charset.h b/src/charset.h index 782e92799ff..25ccaf9d324 100644 --- a/src/charset.h +++ b/src/charset.h @@ -1,5 +1,6 @@ /* Header for charset handler. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2003 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 @@ -1,6 +1,6 @@ /* Cursor motion subroutines for GNU Emacs. Copyright (C) 1985, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. based primarily on public domain code written by Chris Torek This file is part of GNU Emacs. @@ -1,6 +1,6 @@ /* Cursor motion calculation definitions for GNU Emacs Copyright (C) 1985, 1989, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cmds.c b/src/cmds.c index c8e7881a9fc..e035ef7fd68 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -1,6 +1,6 @@ /* Simple built-in editing commands. Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/coding.c b/src/coding.c index 6ec0804353f..92194df6a6c 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1,5 +1,6 @@ /* Coding system handler (conversion, detection, etc). - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/coding.h b/src/coding.h index 89ceb7cad3b..41f4aab509c 100644 --- a/src/coding.h +++ b/src/coding.h @@ -1,5 +1,6 @@ /* Header for coding system handler. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2000 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/commands.h b/src/commands.h index ed46141bf11..5c7cad37407 100644 --- a/src/commands.h +++ b/src/commands.h @@ -1,6 +1,6 @@ /* Definitions needed by most editing commands. Copyright (C) 1985, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/composite.c b/src/composite.c index 3b3743b6b2e..a17a52bd15e 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1,5 +1,6 @@ /* Composite sequence support. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1999 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/composite.h b/src/composite.h index ecfa4db3a56..47a86310413 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,5 +1,6 @@ /* Header for composite sequence handler. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1997 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/config.in b/src/config.in index b5b700c69bf..11b842c3d00 100644 --- a/src/config.in +++ b/src/config.in @@ -1,8 +1,8 @@ /* src/config.in. Generated from configure.in by autoheader. */ /* GNU Emacs site configuration template file. - Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004 - Free Software Foundation, Inc. + Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s index 71076eb8b5f..b05faf57b8e 100644 --- a/src/cxux-crt0.s +++ b/src/cxux-crt0.s @@ -1,6 +1,7 @@ /* * External symbol setup file for GNU Emacs on CX/UX - * Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 1990, 2002, 2003, 2004, 2005, + * 2006 Free Software Foundation, Inc. * * This file is part of GNU Emacs. * diff --git a/src/data.c b/src/data.c index 472aff990b1..fbfbb141d48 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, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dired.c b/src/dired.c index f735c8189d6..4075f9b7b79 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, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispextern.h b/src/dispextern.h index 52033a3e5f4..806b675de73 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1,6 +1,6 @@ /* Interface definitions for display code. Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2651,6 +2651,8 @@ extern int help_echo_pos; extern struct frame *last_mouse_frame; extern int last_tool_bar_item; extern int mouse_autoselect_window; +extern int unibyte_display_via_language_environment; + extern void reseat_at_previous_visible_line_start P_ ((struct it *)); extern int calc_pixel_width_or_height P_ ((double *, struct it *, Lisp_Object, diff --git a/src/dispnew.c b/src/dispnew.c index d0a1ba6c7ff..18f949ebe2d 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1,7 +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. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/disptab.h b/src/disptab.h index ed7ec8597a9..0d7a03c43ba 100644 --- a/src/disptab.h +++ b/src/disptab.h @@ -1,5 +1,6 @@ /* Things for GLYPHS and glyph tables. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/doc.c b/src/doc.c index 596bb0bfeec..32c74b71eeb 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, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/doprnt.c b/src/doprnt.c index c67d20f1950..6e71e261788 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -1,7 +1,8 @@ /* 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, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.c b/src/dosfns.c index c4b5747ab7d..2d5169dcf27 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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.h b/src/dosfns.h index 40aaf524e23..4f1cfd83d22 100644 --- a/src/dosfns.h +++ b/src/dosfns.h @@ -3,7 +3,7 @@ Modified by Morten Welinder, 1993-1994. Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ecrt0.c b/src/ecrt0.c index 5ee24dfae8c..a9b993d360e 100644 --- a/src/ecrt0.c +++ b/src/ecrt0.c @@ -1,6 +1,6 @@ /* C code startup routine. Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/editfns.c b/src/editfns.c index 073ee4bff80..7c2c2a8edd0 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1,7 +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. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -717,7 +717,8 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */) { /* If non-zero, then the original point, before re-positioning. */ int orig_point = 0; - int fwd, prev_old, prev_new; + int fwd; + Lisp_Object prev_old, prev_new; if (NILP (new_pos)) /* Use the current point, and afterwards, set it. */ @@ -736,24 +737,24 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */) if (NILP (Vinhibit_field_text_motion) && !EQ (new_pos, old_pos) - && (!NILP (Fget_text_property (new_pos, Qfield, Qnil)) - || !NILP (Fget_text_property (old_pos, Qfield, Qnil)) + && (!NILP (Fget_char_property (new_pos, Qfield, Qnil)) + || !NILP (Fget_char_property (old_pos, Qfield, Qnil)) /* To recognize field boundaries, we must also look at the previous positions; we could use `get_pos_property' instead, but in itself that would fail inside non-sticky fields (like comint prompts). */ || (XFASTINT (new_pos) > BEGV - && !NILP (Fget_text_property (prev_new, Qfield, Qnil))) + && !NILP (Fget_char_property (prev_new, Qfield, Qnil))) || (XFASTINT (old_pos) > BEGV - && !NILP (Fget_text_property (prev_old, Qfield, Qnil)))) + && !NILP (Fget_char_property (prev_old, Qfield, Qnil)))) && (NILP (inhibit_capture_property) /* Field boundaries are again a problem; but now we must decide the case exactly, so we need to call `get_pos_property' as well. */ || (NILP (get_pos_property (old_pos, inhibit_capture_property, Qnil)) && (XFASTINT (old_pos) <= BEGV - || NILP (Fget_text_property (old_pos, inhibit_capture_property, Qnil)) - || NILP (Fget_text_property (prev_old, inhibit_capture_property, Qnil)))))) + || NILP (Fget_char_property (old_pos, inhibit_capture_property, Qnil)) + || NILP (Fget_char_property (prev_old, inhibit_capture_property, Qnil)))))) /* It is possible that NEW_POS is not within the same field as OLD_POS; try to move NEW_POS so that it is. */ { diff --git a/src/epaths.in b/src/epaths.in index ee965cb7615..d494d85139c 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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/eval.c b/src/eval.c index a6c58bc2425..2f89e515f8d 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, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filelock.c b/src/filelock.c index 33e3bcd5732..6a3972dad42 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -1,6 +1,6 @@ /* Lock files for editing. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filemode.c b/src/filemode.c index 6257c6a7664..835a8a3778e 100644 --- a/src/filemode.c +++ b/src/filemode.c @@ -1,6 +1,6 @@ /* filemode.c -- make a string describing file modes Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 b16f3a3dc44..06e7022d89a 100644 --- a/src/firstfile.c +++ b/src/firstfile.c @@ -1,5 +1,6 @@ /* Mark beginning of data space to dump as pure, for GNU Emacs. - Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/floatfns.c b/src/floatfns.c index 71f53542283..d5ca50f9165 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -1,6 +1,6 @@ /* Primitive operations on floating point for GNU Emacs Lisp interpreter. Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fns.c b/src/fns.c index e260c46d4de..c83f9fb0a9f 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,7 +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. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fontset.c b/src/fontset.c index e5d1f4c0b03..9cebcfe1160 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1,5 +1,5 @@ /* Fontset handler. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/fontset.h b/src/fontset.h index c3ef769d1ea..ec9552ef436 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -1,5 +1,6 @@ /* Header for fontset handler. - Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 2000 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/frame.c b/src/frame.c index 9a442b6289f..b84eee01ae3 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, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/frame.h b/src/frame.h index 48cf61d3040..51530ee2dbf 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1,6 +1,6 @@ /* Define frame-object for GNU Emacs. Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fringe.c b/src/fringe.c index 7a042ad200e..bbb35b305ca 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1,7 +1,7 @@ /* Fringe handling (split from xdisp.c). Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/getloadavg.c b/src/getloadavg.c index a2ae9bc310b..3f616b47116 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c @@ -1,6 +1,6 @@ /* Get the system load averages. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995, - 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 1997, 2002, 2003, 2004, 2005, 2006 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 ed47f80b0e0..f38409da452 100644 --- a/src/getpagesize.h +++ b/src/getpagesize.h @@ -1,6 +1,6 @@ /* Emulate getpagesize on systems that lack it. Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gmalloc.c b/src/gmalloc.c index 55aedb7801b..71df287a6b6 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -6,7 +6,7 @@ /* Declarations for `malloc' and friends. Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 67288cab33f..3efc96cfe5d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1,5 +1,5 @@ /* Functions for creating and updating GTK widgets. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gtkutil.h b/src/gtkutil.h index 6b9fd179ec5..742e3ecb1e5 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -1,5 +1,5 @@ /* Definitions and headers for GTK widgets. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/image.c b/src/image.c index 579c04e6f46..879bbf745a3 100644 --- a/src/image.c +++ b/src/image.c @@ -1,6 +1,6 @@ /* Functions for image support on window system. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.c b/src/indent.c index 62ef3766682..22b6fc37669 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, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.h b/src/indent.h index 6026be827e8..ddfd16a16de 100644 --- a/src/indent.h +++ b/src/indent.h @@ -1,6 +1,6 @@ /* Definitions for interface to indent.c Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/insdel.c b/src/insdel.c index 174c0c6a153..6decf7b3f27 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, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.c b/src/intervals.c index e054c6ca429..77971ace2a7 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1,6 +1,6 @@ /* Code for doing intervals. Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.h b/src/intervals.h index 5d7ee470751..5aec706afea 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -1,6 +1,6 @@ /* Definitions and global variables for intervals. Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.c b/src/keyboard.c index 8434dbe1d7a..f50b456feb4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1,7 +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. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.h b/src/keyboard.h index 913f48ee64e..c0c941a0646 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -1,6 +1,6 @@ /* Declarations useful when processing input. Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.c b/src/keymap.c index 41e58973033..01c637132eb 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1,7 +1,7 @@ /* Manipulation of keymaps Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.h b/src/keymap.h index bcf14abcd89..cbd14cf9ba4 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -1,5 +1,6 @@ /* Functions to manipulate keymaps. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lastfile.c b/src/lastfile.c index a229d94fd6a..7c5e067dd02 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -1,5 +1,6 @@ /* Mark end of data space to dump as pure, for GNU Emacs. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lisp.h b/src/lisp.h index a80f76ddd8e..60bf01ab5a1 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, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -485,7 +485,11 @@ extern size_t pure_size; in a Lisp object whose data type says it points to something. */ #define XPNTR(a) (XUINT (a) | DATA_SEG_BITS) #else -#define XPNTR(a) XUINT (a) +/* Some versions of gcc seem to consider the bitfield width when + issuing the "cast to pointer from integer of different size" + warning, so the cast is here to widen the value back to its natural + size. */ +#define XPNTR(a) ((EMACS_INT) XUINT (a)) #endif #endif /* not HAVE_SHM */ #endif /* no XPNTR */ diff --git a/src/lread.c b/src/lread.c index c035b529ce2..ef45f4663ea 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1,7 +1,7 @@ /* Lisp parsing and input streams. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1273,7 +1273,7 @@ openp (path, str, suffixes, storeptr, predicate) SBYTES (XCAR (tail))); } - string = filename = Qnil; + string = filename = encoded_fn = Qnil; GCPRO6 (str, string, filename, path, suffixes, encoded_fn); if (storeptr) diff --git a/src/m/7300.h b/src/m/7300.h index bb261c9188a..a8751efa52a 100644 --- a/src/m/7300.h +++ b/src/m/7300.h @@ -1,5 +1,6 @@ /* machine description file for AT&T UNIX PC model 7300 - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 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 399fb7c9249..326fb7760ae 100644 --- a/src/m/acorn.h +++ b/src/m/acorn.h @@ -1,5 +1,6 @@ /* Machine description file for Acorn RISCiX machines. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 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 b59322e3d0c..d56624a1eac 100644 --- a/src/m/alliant-2800.h +++ b/src/m/alliant-2800.h @@ -1,5 +1,6 @@ /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800. - Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/alliant.h b/src/m/alliant.h index cbc5734ab31..49459c0b7f7 100644 --- a/src/m/alliant.h +++ b/src/m/alliant.h @@ -1,6 +1,6 @@ /* alliant.h Alliant machine running system version 2 or 3. Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 41fefaf20fd..47003400846 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -1,6 +1,6 @@ /* machine description file For the alpha chip. Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/altos.h b/src/m/altos.h index 743752d99ec..16e7fb7ce06 100644 --- a/src/m/altos.h +++ b/src/m/altos.h @@ -1,6 +1,6 @@ /* altos machine description file Altos 3068 Unix System V Release 2 Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/amdahl.h b/src/m/amdahl.h index 89d4b6cb6f7..e418e3a43bf 100644 --- a/src/m/amdahl.h +++ b/src/m/amdahl.h @@ -1,6 +1,6 @@ /* amdahl machine description file Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 14ddd16406e..3a1ace91b41 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, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/apollo.h b/src/m/apollo.h index 4aa62b0b209..d9b3cffdb6d 100644 --- a/src/m/apollo.h +++ b/src/m/apollo.h @@ -1,6 +1,6 @@ /* machine description file for Apollo machine. Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/arm.h b/src/m/arm.h index 358445e0649..0a49f0cbd4b 100644 --- a/src/m/arm.h +++ b/src/m/arm.h @@ -1,5 +1,6 @@ /* Machine description file for ARM-based non-RISCiX machines. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/att3b.h b/src/m/att3b.h index 757b47d3f37..049593ebcf4 100644 --- a/src/m/att3b.h +++ b/src/m/att3b.h @@ -1,5 +1,6 @@ /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 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 b9a2932ef07..50355b25bd6 100644 --- a/src/m/aviion.h +++ b/src/m/aviion.h @@ -1,6 +1,6 @@ /* machine description file for Data General AViiON. Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/celerity.h b/src/m/celerity.h index 639d680afdb..10d38e14c6c 100644 --- a/src/m/celerity.h +++ b/src/m/celerity.h @@ -1,6 +1,6 @@ /* machine description file for Celerity. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/clipper.h b/src/m/clipper.h index af9f67d8a37..0dfa13382b3 100644 --- a/src/m/clipper.h +++ b/src/m/clipper.h @@ -1,6 +1,6 @@ /* machine description file for clipper Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h index 48727bedbe3..f8df583657a 100644 --- a/src/m/cnvrgnt.h +++ b/src/m/cnvrgnt.h @@ -1,5 +1,6 @@ /* machine description file for convergent S series. - Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/convex.h b/src/m/convex.h index b7fcc71b1c3..fa87d89e3d3 100644 --- a/src/m/convex.h +++ b/src/m/convex.h @@ -1,6 +1,6 @@ /* machine description file for Convex (all models). Copyright (C) 1987, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cydra5.h b/src/m/cydra5.h index 9806fc30a47..a64f4761c25 100644 --- a/src/m/cydra5.h +++ b/src/m/cydra5.h @@ -1,6 +1,6 @@ /* machine description file for Cydrome's CYDRA 5 mini super computer Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/delta88k.h b/src/m/delta88k.h index 517a0f1744b..86e416e887d 100644 --- a/src/m/delta88k.h +++ b/src/m/delta88k.h @@ -1,6 +1,6 @@ /* Machine description file for Motorola System V/88 machines Copyright (C) 1985, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dpx2.h b/src/m/dpx2.h index 8d1ceb3db06..2a90ff46284 100644 --- a/src/m/dpx2.h +++ b/src/m/dpx2.h @@ -1,6 +1,6 @@ /* machine description for Bull DPX/2 range Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dual.h b/src/m/dual.h index 134a5e7720e..d02ac5bc38e 100644 --- a/src/m/dual.h +++ b/src/m/dual.h @@ -1,6 +1,6 @@ /* machine description file for Dual machines using unisoft port. Copyright (C) 1985, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/elxsi.h b/src/m/elxsi.h index f702dcf0de2..0cb0c5513bf 100644 --- a/src/m/elxsi.h +++ b/src/m/elxsi.h @@ -1,6 +1,6 @@ /* machine description file for Elxsi machine (running enix). Copyright (C) 1986, 1992, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 b377bdeddaa..9db133ba682 100644 --- a/src/m/ews4800.h +++ b/src/m/ews4800.h @@ -1,6 +1,6 @@ /* m- file for NEC EWS4800 RISC series. Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 1c784f28f4e..272a06cf305 100644 --- a/src/m/gould-np1.h +++ b/src/m/gould-np1.h @@ -1,5 +1,6 @@ /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1) - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/gould.h b/src/m/gould.h index a9168009d47..3b5f1494e78 100644 --- a/src/m/gould.h +++ b/src/m/gould.h @@ -5,7 +5,8 @@ * RELEASE2_1 in config.h. This may also be necessary with un-updated * official releases of 2.1 - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp800.h b/src/m/hp800.h index 2f661989a15..01146e52359 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -1,5 +1,6 @@ /* machine description file for hp9000 series 800 machines. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h index e0b3a5ce5c3..9760b9bd2ed 100644 --- a/src/m/hp9000s300.h +++ b/src/m/hp9000s300.h @@ -1,5 +1,6 @@ /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/i860.h b/src/m/i860.h index 0ecf9e62087..d74a01a889c 100644 --- a/src/m/i860.h +++ b/src/m/i860.h @@ -1,6 +1,6 @@ /* machine description file for i860. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ia64.h b/src/m/ia64.h index af790946afa..560cd30f599 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -1,5 +1,6 @@ /* machine description file for the IA-64 architecture. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Contributed by David Mosberger <davidm@hpl.hp.com> This file is part of GNU Emacs. diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h index 3d954ae9d19..1a9ed6efe11 100644 --- a/src/m/ibm370aix.h +++ b/src/m/ibm370aix.h @@ -1,6 +1,6 @@ /* m/ file for IBM 370 running AIX. Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 539de924d17..ea895cd4fd8 100644 --- a/src/m/ibmps2-aix.h +++ b/src/m/ibmps2-aix.h @@ -1,5 +1,6 @@ /* machine description file for ibm ps/2 aix386. - Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 0ff702d090d..3d3e45eda81 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -1,5 +1,6 @@ /* R2 AIX machine/system dependent defines - Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005, + 2006 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 44bfd77c1d0..43e11b36428 100644 --- a/src/m/ibmrt-aix.h +++ b/src/m/ibmrt-aix.h @@ -1,6 +1,6 @@ /* RTPC AIX machine/system dependent defines Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h index f6c23d9d919..e78d182940c 100644 --- a/src/m/ibmrt.h +++ b/src/m/ibmrt.h @@ -1,5 +1,6 @@ /* RTPC machine dependent defines - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibms390.h b/src/m/ibms390.h index 323ef33f633..d60b33fdd04 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -1,6 +1,6 @@ /* machine description file template. Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/intel386.h b/src/m/intel386.h index 238015fd345..0d2aacf8d19 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -1,5 +1,6 @@ /* Machine description file for intel 386. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/iris4d.h b/src/m/iris4d.h index 93fe2062674..bc8d1242710 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -1,5 +1,6 @@ /* machine description file for Iris-4D machines. Use with s/irix*.h. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/irist.h b/src/m/irist.h index b40ffb5dff9..a366b521a9a 100644 --- a/src/m/irist.h +++ b/src/m/irist.h @@ -1,7 +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, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 416335d1bff..5b6c3cd0214 100644 --- a/src/m/isi-ov.h +++ b/src/m/isi-ov.h @@ -1,6 +1,6 @@ /* machine description file for ISI 68000's Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/m68k.h b/src/m/m68k.h index 7b2ffa81351..31307ffa499 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h @@ -1,6 +1,6 @@ /* Machine description file for generic Motorola 68k. Copyright (C) 1985, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/macppc.h b/src/m/macppc.h index 9e4297df3b7..25005888c77 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -1,6 +1,6 @@ /* machine description file For the powerpc Macintosh. Copyright (C) 1994, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/masscomp.h b/src/m/masscomp.h index 01fddc751f1..df0d9a1aa1a 100644 --- a/src/m/masscomp.h +++ b/src/m/masscomp.h @@ -1,5 +1,6 @@ /* machine description file for Masscomp 5000 series running RTU, ucb universe. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mega68.h b/src/m/mega68.h index ef1623ca460..7db67fa0cca 100644 --- a/src/m/mega68.h +++ b/src/m/mega68.h @@ -1,5 +1,6 @@ /* machine description file for Megatest 68000's. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mg1.h b/src/m/mg1.h index 4e4b3525d6e..92e358837c4 100644 --- a/src/m/mg1.h +++ b/src/m/mg1.h @@ -1,5 +1,6 @@ /* machine description file for Whitechapel Computer Works MG1 (ns16000 based). - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 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 fc1a8a2e0d6..27274c8b527 100644 --- a/src/m/mips-siemens.h +++ b/src/m/mips-siemens.h @@ -1,6 +1,6 @@ /* m- file for Mips machines. Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 28a35e02677..dc45a99d06b 100644 --- a/src/m/mips.h +++ b/src/m/mips.h @@ -1,6 +1,6 @@ /* m- file for Mips machines. Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/news.h b/src/m/news.h index dec413c3f9e..5ac2cd6b6dc 100644 --- a/src/m/news.h +++ b/src/m/news.h @@ -1,6 +1,6 @@ /* machine description file for Sony's NEWS workstations, NEWS-OS 3.0. Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/next.h b/src/m/next.h index dfb3cd11cbf..b519e41920d 100644 --- a/src/m/next.h +++ b/src/m/next.h @@ -1,5 +1,6 @@ /* Configuration file for the NeXT machine. - Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh3000.h b/src/m/nh3000.h index 42255473020..ad2d8dd1340 100644 --- a/src/m/nh3000.h +++ b/src/m/nh3000.h @@ -1,7 +1,8 @@ /* 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, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh4000.h b/src/m/nh4000.h index 04068f0c065..1c0bc51c896 100644 --- a/src/m/nh4000.h +++ b/src/m/nh4000.h @@ -1,6 +1,7 @@ /* machine description for Harris NightHawk 88k based machines (includes nh4000 and nh5000 machines). - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns16000.h b/src/m/ns16000.h index 49f514ced06..5e9793a44b8 100644 --- a/src/m/ns16000.h +++ b/src/m/ns16000.h @@ -1,5 +1,6 @@ /* machine description file for ns16000. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns32000.h b/src/m/ns32000.h index 858630b74ab..33e48d297bc 100644 --- a/src/m/ns32000.h +++ b/src/m/ns32000.h @@ -1,6 +1,6 @@ /* machine description file for National Semiconductor 32000, running Genix. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nu.h b/src/m/nu.h index 1e5518e451f..ec051150bdf 100644 --- a/src/m/nu.h +++ b/src/m/nu.h @@ -1,5 +1,6 @@ /* machine description file for TI Nu machines using system V. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion.h b/src/m/orion.h index a73b357d50f..3db485dd3f1 100644 --- a/src/m/orion.h +++ b/src/m/orion.h @@ -1,5 +1,6 @@ /* machine description file for HLH Orion. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion105.h b/src/m/orion105.h index e75a8e67a84..66f87748099 100644 --- a/src/m/orion105.h +++ b/src/m/orion105.h @@ -1,5 +1,6 @@ /* machine description file for HLH Orion 1/05 (Clipper). - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk> This file is part of GNU Emacs. diff --git a/src/m/pfa50.h b/src/m/pfa50.h index 50e79b623ca..85d281073f1 100644 --- a/src/m/pfa50.h +++ b/src/m/pfa50.h @@ -1,6 +1,6 @@ /* Machine description file for PFU A-series. Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/plexus.h b/src/m/plexus.h index 10826a70bc2..8b3e9be7849 100644 --- a/src/m/plexus.h +++ b/src/m/plexus.h @@ -1,5 +1,6 @@ /* machine description file for the Plexus running System V.2. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powermac.h b/src/m/powermac.h index 14b2e110734..232e424da35 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, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h index 1dfd2df25b4..b4681db06bd 100644 --- a/src/m/powerpcle.h +++ b/src/m/powerpcle.h @@ -1,5 +1,6 @@ /* machine description file for PowerPC. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/pyramid.h b/src/m/pyramid.h index 12010087a58..2dbd713f881 100644 --- a/src/m/pyramid.h +++ b/src/m/pyramid.h @@ -1,6 +1,6 @@ /* machine description file for pyramid. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 3c22639e3b2..dbb0944a330 100644 --- a/src/m/sequent-ptx.h +++ b/src/m/sequent-ptx.h @@ -1,6 +1,6 @@ /* machine description file for SEQUENT machines running DYNIX/ptx Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sequent.h b/src/m/sequent.h index f082880b4fc..e970275901c 100644 --- a/src/m/sequent.h +++ b/src/m/sequent.h @@ -1,6 +1,6 @@ /* machine description file for SEQUENT BALANCE machines Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sparc.h b/src/m/sparc.h index 20ec53c1344..c9ef035653b 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -1,5 +1,6 @@ /* machine description file for Sun 4 SPARC. - Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sps7.h b/src/m/sps7.h index 422d2470aaa..52edc570f92 100644 --- a/src/m/sps7.h +++ b/src/m/sps7.h @@ -1,6 +1,6 @@ /* machine description file for Bull SPS-7. Copyright (C) 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sr2k.h b/src/m/sr2k.h index 875f428dc1f..14a90c666f4 100644 --- a/src/m/sr2k.h +++ b/src/m/sr2k.h @@ -1,5 +1,6 @@ /* machine description file for Hitachi SR2001/SR2201 machines. - Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/stride.h b/src/m/stride.h index ff900d49b38..6f05b17d96e 100644 --- a/src/m/stride.h +++ b/src/m/stride.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun1.h b/src/m/sun1.h index 810bad7fd58..5ded70a9e47 100644 --- a/src/m/sun1.h +++ b/src/m/sun1.h @@ -1,6 +1,6 @@ /* machine description file for Sun 68000's Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun2.h b/src/m/sun2.h index 9df032049e3..1afa4a2fa63 100644 --- a/src/m/sun2.h +++ b/src/m/sun2.h @@ -2,7 +2,7 @@ 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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun386.h b/src/m/sun386.h index 5970f90b98b..435c1ded6d2 100644 --- a/src/m/sun386.h +++ b/src/m/sun386.h @@ -1,8 +1,9 @@ /* machine description file for Sun's 386-based RoadRunner. This file borrows heavily from - "sun2.h", but since that file is heavily cpu-specific, it was easier - not to include it. + "sun2.h", but since that file is heavily cpu-specific, it was easier + not to include it. - Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/symmetry.h b/src/m/symmetry.h index 4954f596442..91209d0eb67 100644 --- a/src/m/symmetry.h +++ b/src/m/symmetry.h @@ -1,6 +1,6 @@ /* machine description file for SEQUENT SYMMETRY machines Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tad68k.h b/src/m/tad68k.h index b8b3859f407..fce223da826 100644 --- a/src/m/tad68k.h +++ b/src/m/tad68k.h @@ -1,5 +1,6 @@ /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tahoe.h b/src/m/tahoe.h index 47db3f93deb..07ec23c7bb6 100644 --- a/src/m/tahoe.h +++ b/src/m/tahoe.h @@ -1,5 +1,6 @@ /* machine description file for tahoe. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/targon31.h b/src/m/targon31.h index 5ac18648387..7100e0e8705 100644 --- a/src/m/targon31.h +++ b/src/m/targon31.h @@ -1,6 +1,6 @@ /* targon31 machine description file Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tek4300.h b/src/m/tek4300.h index a84135291cb..3ff3ca4a6a0 100644 --- a/src/m/tek4300.h +++ b/src/m/tek4300.h @@ -1,5 +1,6 @@ /* machine description file for tek4300. - Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h index 4db981a8096..24c10330363 100644 --- a/src/m/tekxd88.h +++ b/src/m/tekxd88.h @@ -1,7 +1,8 @@ /* 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, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/template.h b/src/m/template.h index c7ce2c2cb1f..2b39964018a 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -1,6 +1,6 @@ /* machine description file template. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32.h b/src/m/tower32.h index cd4ab96de11..06ed7efe5d7 100644 --- a/src/m/tower32.h +++ b/src/m/tower32.h @@ -1,5 +1,6 @@ /* machine description file for the NCR Tower 32 running System V.2. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h index 2c1e55c0023..8f5c60cd7c8 100644 --- a/src/m/tower32v3.h +++ b/src/m/tower32v3.h @@ -1,5 +1,6 @@ /* machine description file for the NCR Tower 32 running System V.3. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ustation.h b/src/m/ustation.h index c62d37d6429..0a70df92233 100644 --- a/src/m/ustation.h +++ b/src/m/ustation.h @@ -1,6 +1,6 @@ /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30). Copyright (C) 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/vax.h b/src/m/vax.h index d414d6b57e7..9332b8f494d 100644 --- a/src/m/vax.h +++ b/src/m/vax.h @@ -1,6 +1,6 @@ /* machine description file for vax. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/wicat.h b/src/m/wicat.h index 78842f32a43..24bb2acd210 100644 --- a/src/m/wicat.h +++ b/src/m/wicat.h @@ -1,5 +1,6 @@ /* machine description file for WICAT machines. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h index cf48ca8aa88..4351f14144f 100644 --- a/src/m/windowsnt.h +++ b/src/m/windowsnt.h @@ -1,7 +1,7 @@ /* Machine description file for Windows NT. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/xps100.h b/src/m/xps100.h index 3a851aa9ebd..a9ac9bc5e36 100644 --- a/src/m/xps100.h +++ b/src/m/xps100.h @@ -2,7 +2,7 @@ Mark J. Hewitt (mjh@uk.co.kernel) Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mac.c b/src/mac.c index 5a56bd57817..a71194f9aee 100644 --- a/src/mac.c +++ b/src/mac.c @@ -1,6 +1,6 @@ /* Unix emulation routines for GNU Emacs on the Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macfns.c b/src/macfns.c index a9119cc4ab9..ae7f1d87be4 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1,6 +1,6 @@ /* Graphical user interface functions for Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macgui.h b/src/macgui.h index 74c64bfb41d..cfe35e82945 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -1,6 +1,6 @@ /* Definitions and headers for communication on the Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macmenu.c b/src/macmenu.c index 1b132407df7..91cf28f7456 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -1,6 +1,6 @@ /* Menu support for GNU Emacs on Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.c b/src/macros.c index 8167e274dab..ef3ff8c0523 100644 --- a/src/macros.c +++ b/src/macros.c @@ -1,6 +1,6 @@ /* Keyboard macros. Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.h b/src/macros.h index 7acd46dc2ed..bdd510456b0 100644 --- a/src/macros.h +++ b/src/macros.h @@ -1,5 +1,6 @@ /* Definitions for keyboard macro interpretation in GNU Emacs. - Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macterm.c b/src/macterm.c index 4e7b0fde4e2..8e736f73124 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -1,6 +1,6 @@ /* Implementation of GUI terminal on the Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macterm.h b/src/macterm.h index 458fe63e5df..6714add1878 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -1,6 +1,6 @@ /* Display module for Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -206,9 +206,6 @@ extern struct mac_display_info one_mac_display_info; FONT-LIST-CACHE records previous values returned by x-list-fonts. */ extern Lisp_Object x_display_name_list; -/* A flag to control how to display unibyte 8-bit character. */ -extern int unibyte_display_via_language_environment; - extern struct x_display_info *x_display_info_for_display P_ ((Display *)); extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 2bcc736e685..ec407c883f3 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/marker.c b/src/marker.c index 882054b74f9..0511debbe54 100644 --- a/src/marker.c +++ b/src/marker.c @@ -1,6 +1,6 @@ /* Markers: examining, setting and deleting. Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/md5.c b/src/md5.c index 4f055447eac..d3c25b04d3e 100644 --- a/src/md5.c +++ b/src/md5.c @@ -1,7 +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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 adcc6bf48f6..09bf02ff753 100644 --- a/src/md5.h +++ b/src/md5.h @@ -1,7 +1,7 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 d7ac6a3e366..292293b2f98 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -1,6 +1,6 @@ /* Includes for memory limit warnings. Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/minibuf.c b/src/minibuf.c index 79b3041c3b2..2894eb19324 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1,6 +1,7 @@ /* Minibuffer input and completion. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mktime.c b/src/mktime.c index 025f54d95c2..a85ebeb3783 100644 --- a/src/mktime.c +++ b/src/mktime.c @@ -1,6 +1,6 @@ /* Convert a `struct tm' to a time_t value. Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 ee899d1bee4..026ebc572b4 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,6 +1,6 @@ /* MS-DOS specific C utilities. -*- coding: raw-text -*- Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/msdos.h b/src/msdos.h index b6c6aca1493..8bfbcf2d10c 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -1,6 +1,6 @@ /* MS-DOS specific C utilities, interface. Copyright (C) 1993, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/prefix-args.c b/src/prefix-args.c index ee1ee7e7c7f..1a855e0e34b 100644 --- a/src/prefix-args.c +++ b/src/prefix-args.c @@ -1,5 +1,6 @@ /* prefix-args.c - echo each argument, prefixed by a string. - Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1992, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/print.c b/src/print.c index cc2902acb2b..5f41f6f7737 100644 --- a/src/print.c +++ b/src/print.c @@ -1,7 +1,7 @@ /* Lisp object printing and output streams. Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.c b/src/process.c index cde2c606d93..74922b0f57d 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +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. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.h b/src/process.h index cadc9b7031c..9625556888c 100644 --- a/src/process.h +++ b/src/process.h @@ -1,6 +1,6 @@ /* Definitions for asynchronous process control in GNU Emacs. Copyright (C) 1985, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/puresize.h b/src/puresize.h index e46ca103d7d..da81e09a345 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -1,5 +1,6 @@ /* How much read-only Lisp storage a dumped Emacs needs. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ralloc.c b/src/ralloc.c index 35a8cb9c58a..fea9ea5d0a8 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1,6 +1,6 @@ /* Block-relocating memory allocator. Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/regex.h b/src/regex.h index 8a669541ff1..efae7749f31 100644 --- a/src/regex.h +++ b/src/regex.h @@ -2,7 +2,7 @@ expression library, version 0.12. Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 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 d49278eb886..cedb0017da0 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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/region-cache.h b/src/region-cache.h index 51d2ceb1e62..40e68084cce 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -1,6 +1,6 @@ /* Header file: Caching facts about regions of the buffer, for optimization. Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h index eedfe3d15be..f77a209f0d2 100644 --- a/src/s/aix3-1.h +++ b/src/s/aix3-1.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on IBM AIX version 3.1 Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 f36bc016ca8..3e6a44f1fab 100644 --- a/src/s/bsd4-1.h +++ b/src/s/bsd4-1.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.1. Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 f4e60b0fdbd..ace519c0d74 100644 --- a/src/s/bsd4-2.h +++ b/src/s/bsd4-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.2 Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 37d6a63e984..483effe71c1 100644 --- a/src/s/bsd4-3.h +++ b/src/s/bsd4-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.3 Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cxux.h b/src/s/cxux.h index 118d93d579c..3c4ffcd24a2 100644 --- a/src/s/cxux.h +++ b/src/s/cxux.h @@ -1,5 +1,6 @@ /* Header file for Harris CXUX. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 921cff35bc7..749d1a38e3e 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -2,7 +2,7 @@ This file describes the parameters that system description files should define or not. Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/darwin.h b/src/s/darwin.h index 6227010e3ed..91975cd441b 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -1,5 +1,6 @@ /* System description header file for Darwin (Mac OS X). - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux.h b/src/s/dgux.h index 82956a900d9..d48d95709c8 100644 --- a/src/s/dgux.h +++ b/src/s/dgux.h @@ -1,7 +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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux4.h b/src/s/dgux4.h index 35834ad4da2..ee24cd65b50 100644 --- a/src/s/dgux4.h +++ b/src/s/dgux4.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX Release 4.10 and above. - Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005, + 2006 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 7ec88a435eb..d0f6d4f43e8 100644 --- a/src/s/dgux5-4-3.h +++ b/src/s/dgux5-4-3.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX version 5.4 Release 3.00 and above. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 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 3f059c32c24..be0ba73b4e0 100644 --- a/src/s/dgux5-4r2.h +++ b/src/s/dgux5-4r2.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX 5.4 Release 2.xx systems. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/freebsd.h b/src/s/freebsd.h index 83949fd2819..78f314700b3 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -2,7 +2,7 @@ This file describes the parameters that system description files should define or not. Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 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 f87dcaded1b..4ef3db9f2ea 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -1,6 +1,6 @@ /* This file is the configuration file for Linux-based GNU systems Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/gnu.h b/src/s/gnu.h index 0da816c32d3..71f1dd34a5e 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on the GNU Hurd. Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/hpux.h b/src/s/hpux.h index 30ade71bf20..b8f9c62a893 100644 --- a/src/s/hpux.h +++ b/src/s/hpux.h @@ -1,7 +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, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 a3b6c8ad0ad..6b0009c1c38 100644 --- a/src/s/iris3-5.h +++ b/src/s/iris3-5.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics 3.5 Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 1d8b96cc23f..d0c68bd89cb 100644 --- a/src/s/iris3-6.h +++ b/src/s/iris3-6.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6. Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 a613779913a..a65242179a9 100644 --- a/src/s/irix3-3.h +++ b/src/s/irix3-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3. Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/lynxos.h b/src/s/lynxos.h index 614735d290d..b822bad3691 100644 --- a/src/s/lynxos.h +++ b/src/s/lynxos.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on LynxOS-3.0.1 Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 b1989318fba..5c6d1d07c20 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -1,6 +1,6 @@ /* System description file for Windows NT. Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/msdos.h b/src/s/msdos.h index 9469b33227f..966384ee352 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -1,7 +1,7 @@ /* System description file for MS-DOS Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/newsos5.h b/src/s/newsos5.h index d2bed2189be..0b441d74e24 100644 --- a/src/s/newsos5.h +++ b/src/s/newsos5.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2 Copyright (C) 1992, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/nextstep.h b/src/s/nextstep.h index 0c0b01c10bd..8ea45e16e6e 100644 --- a/src/s/nextstep.h +++ b/src/s/nextstep.h @@ -1,6 +1,6 @@ /* Configuration file for the NeXTstep system. Copyright (C) 1990, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/ptx.h b/src/s/ptx.h index 1411dee70d8..319bbc049f2 100644 --- a/src/s/ptx.h +++ b/src/s/ptx.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 aee5d6ddc58..d6281d256b6 100644 --- a/src/s/riscix1-1.h +++ b/src/s/riscix1-1.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3) - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/riscix12.h b/src/s/riscix12.h index 625b667d7b5..a4811877070 100644 --- a/src/s/riscix12.h +++ b/src/s/riscix12.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3) - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/rtu.h b/src/s/rtu.h index b2d0c16e59a..2a9df14a14c 100644 --- a/src/s/rtu.h +++ b/src/s/rtu.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe. Copyright (C) 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco4.h b/src/s/sco4.h index 627007e9a52..0eda0a3f728 100644 --- a/src/s/sco4.h +++ b/src/s/sco4.h @@ -1,6 +1,6 @@ /* System description file for SCO 3.2v4. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco5.h b/src/s/sco5.h index 9fbbf072a12..06166f32fd9 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, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/template.h b/src/s/template.h index 0610e16473a..94b3787811f 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -2,7 +2,7 @@ This file describes the parameters that system description files should define or not. Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/umax.h b/src/s/umax.h index f4923f33053..ae3b98cfcad 100644 --- a/src/s/umax.h +++ b/src/s/umax.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on UMAX 4.2 Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 cca703adb82..096096f9f7a 100644 --- a/src/s/unipl5-2.h +++ b/src/s/unipl5-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 5f9943f8477..94389290726 100644 --- a/src/s/usg5-0.h +++ b/src/s/usg5-0.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V.0 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 b090f3c32b6..a60a985856d 100644 --- a/src/s/usg5-2-2.h +++ b/src/s/usg5-2-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 e63bddfc060..7f1fcb92ec5 100644 --- a/src/s/usg5-2.h +++ b/src/s/usg5-2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0 Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 12259936928..56a448e9dba 100644 --- a/src/s/usg5-3.h +++ b/src/s/usg5-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 3 Copyright (C) 1987, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 b8c2f8d9fa2..5e202e3edad 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 4 Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/vms.h b/src/s/vms.h index e3c9dc725c0..51f3ca1a531 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -1,5 +1,6 @@ /* system description header for VMS - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/xenix.h b/src/s/xenix.h index e67b897faff..09a7b61fcd1 100644 --- a/src/s/xenix.h +++ b/src/s/xenix.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2 Copyright (C) 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/scroll.c b/src/scroll.c index 6e633d4e60b..e8981fcfb5f 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,6 +1,6 @@ /* Calculate what line insertion or deletion to do, and do it, Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/search.c b/src/search.c index e35545f0e19..285bb92c37b 100644 --- a/src/search.c +++ b/src/search.c @@ -1,6 +1,6 @@ /* String search routines for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sheap.c b/src/sheap.c index cc740173a24..192af4030c6 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -1,7 +1,7 @@ /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin; complete rewrite of xemacs Cygwin `unexec' code - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sound.c b/src/sound.c index 1e6a17d0275..c1d5c40e9bb 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,6 +1,6 @@ /* sound.c -- sound support. Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/strftime.c b/src/strftime.c index 88a54b7bee4..f46b40f232a 100644 --- a/src/strftime.c +++ b/src/strftime.c @@ -1,5 +1,5 @@ /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 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 8de639b7480..1c04f1108a8 100644 --- a/src/sunfns.c +++ b/src/sunfns.c @@ -1,6 +1,6 @@ /* Functions for Sun Windows menus and selection buffer. Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 32ef35d2d55..f8d50d1e5b4 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,6 +1,6 @@ /* GNU Emacs routines to deal with syntax tables; also word and list parsing. Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syntax.h b/src/syntax.h index ac449dc89e4..c7e67ebf355 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -1,6 +1,6 @@ /* Declarations having to do with GNU Emacs syntax tables. Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysdep.c b/src/sysdep.c index 3bc72c51193..3e06170e721 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, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysselect.h b/src/sysselect.h index d57527f9ed1..ba204dafe3f 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -1,5 +1,6 @@ /* sysselect.h - System-dependent definitions for the select function. - Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syssignal.h b/src/syssignal.h index 43e8847cea5..cc2212d5e19 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -1,6 +1,6 @@ /* syssignal.h - System-dependent definitions for signals. Copyright (C) 1993, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systime.h b/src/systime.h index 9851db4cf33..00373b257b3 100644 --- a/src/systime.h +++ b/src/systime.h @@ -1,6 +1,6 @@ /* systime.h - System-dependent definitions for time manipulations. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systty.h b/src/systty.h index af9f5e3aa88..6d6a6f01ea9 100644 --- a/src/systty.h +++ b/src/systty.h @@ -1,6 +1,6 @@ /* systty.h - System-dependent definitions for terminals. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syswait.h b/src/syswait.h index 37d59d68ac5..bb4937f353e 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -1,6 +1,6 @@ /* Define wait system call interface for Emacs. Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/term.c b/src/term.c index aae4f7dffdc..c12ae8937d8 100644 --- a/src/term.c +++ b/src/term.c @@ -1,6 +1,6 @@ /* Terminal control module for terminals described by TERMCAP Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1998, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1659,10 +1659,10 @@ static void produce_stretch_glyph P_ ((struct it *)); /* Append glyphs to IT's glyph_row. Called from produce_glyphs for - terminal frames if IT->glyph_row != NULL. IT->c is the character - for which to produce glyphs; IT->face_id contains the character's - face. Padding glyphs are appended if IT->c has a IT->pixel_width > - 1. */ + terminal frames if IT->glyph_row != NULL. IT->char_to_display is + the character for which to produce glyphs; IT->face_id contains the + character's face. Padding glyphs are appended if IT->c has a + IT->pixel_width > 1. */ static void append_glyph (it) @@ -1682,7 +1682,7 @@ append_glyph (it) { glyph->type = CHAR_GLYPH; glyph->pixel_width = 1; - glyph->u.ch = it->c; + glyph->u.ch = it->char_to_display; glyph->face_id = it->face_id; glyph->padding_p = i > 0; glyph->charpos = CHARPOS (it->position); @@ -1733,6 +1733,9 @@ produce_glyphs (it) xassert (it->what == IT_CHARACTER || it->what == IT_COMPOSITION); + /* Maybe translate single-byte characters to multibyte. */ + it->char_to_display = it->c; + if (it->c >= 040 && it->c < 0177) { it->pixel_width = it->nglyphs = 1; @@ -1762,13 +1765,11 @@ produce_glyphs (it) { int n = nspaces; - it->c = ' '; + it->char_to_display = ' '; it->pixel_width = it->len = 1; while (n--) append_glyph (it); - - it->c = '\t'; } it->pixel_width = nspaces; @@ -1861,17 +1862,15 @@ produce_stretch_glyph (it) Lisp_Object o_object = it->object; Lisp_Object object = it->stack[it->sp - 1].string; int n = width; - int c = it->c; if (!STRINGP (object)) object = it->w->buffer; it->object = object; - it->c = ' '; + it->char_to_display = ' '; it->pixel_width = it->len = 1; while (n--) append_glyph (it); it->object = o_object; - it->c = c; } it->pixel_width = width; it->nglyphs = width; diff --git a/src/termcap.c b/src/termcap.c index 2f6f324eada..dee5465ebf9 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -1,6 +1,6 @@ /* Work-alike for termcap, plus extra features. Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 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 04583b9309c..3787e338d40 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -1,6 +1,6 @@ /* Flags and parameters describing terminal's characteristics. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termhooks.h b/src/termhooks.h index 2f0e1089227..8405cac3b88 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -1,7 +1,7 @@ /* Hooks by which low level terminal operations can be made to call other routines. Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/terminfo.c b/src/terminfo.c index 5c0aa1ccf05..7fccfaf1700 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -1,6 +1,6 @@ /* Interface from Emacs to terminfo. Copyright (C) 1985, 1986, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termopts.h b/src/termopts.h index eaac0557cdb..5d4059babb0 100644 --- a/src/termopts.h +++ b/src/termopts.h @@ -1,6 +1,6 @@ /* Flags and parameters describing user options for handling the terminal. Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/textprop.c b/src/textprop.c index 029f2f41031..65823d9fa3f 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, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/tparam.c b/src/tparam.c index e593589d5cb..ea04f7eaea1 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -1,6 +1,6 @@ /* Merge parameters into a termcap entry string. Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 7863c41227e..05a8651b6c2 100644 --- a/src/uaf.h +++ b/src/uaf.h @@ -1,5 +1,6 @@ /* GNU Emacs VMS UAF definition file. - Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/undo.c b/src/undo.c index bf774affac5..3313c8e306c 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, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexaix.c b/src/unexaix.c index 071f09898ed..4785aa1dcb3 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -1,6 +1,6 @@ /* Dump an executable image. Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexalpha.c b/src/unexalpha.c index 069c39b398b..ead259437f6 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c @@ -1,7 +1,7 @@ /* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf). Copyright (C) 1994, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexapollo.c b/src/unexapollo.c index f1481d684a3..ace28dfa38d 100644 --- a/src/unexapollo.c +++ b/src/unexapollo.c @@ -1,6 +1,6 @@ /* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x Copyright (C) 1988, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexconvex.c b/src/unexconvex.c index 6f05e4ae938..8409463b783 100644 --- a/src/unexconvex.c +++ b/src/unexconvex.c @@ -8,7 +8,7 @@ break it. Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexcw.c b/src/unexcw.c index cfd87781a16..aee4f58896c 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -1,7 +1,7 @@ /* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexec.c b/src/unexec.c index ebf813306da..7fe7e26568c 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -1,5 +1,5 @@ /* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexelf.c b/src/unexelf.c index c53974be9f2..30a35372544 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -1,5 +1,5 @@ /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexenix.c b/src/unexenix.c index 159c0b2f6d8..c1ad8bbf7eb 100644 --- a/src/unexenix.c +++ b/src/unexenix.c @@ -7,7 +7,7 @@ maintenance might break it. Copyright (C) 1988, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 43e1f5e805c..db77a83cee2 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -1,5 +1,6 @@ /* Dump Emacs in Mach-O format for use on Mac OS X. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmips.c b/src/unexmips.c index 212f7ed5926..86129e052cf 100644 --- a/src/unexmips.c +++ b/src/unexmips.c @@ -7,7 +7,7 @@ maintenance might break it. Copyright (C) 1988, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexnext.c b/src/unexnext.c index b374dd8e9b8..b453da3b023 100644 --- a/src/unexnext.c +++ b/src/unexnext.c @@ -1,6 +1,6 @@ /* Dump Emacs in macho format. Copyright (C) 1990, 1993, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 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 d6b3ae68969..8d72acf1a18 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, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexsunos4.c b/src/unexsunos4.c index 5e221050f36..19d982f6140 100644 --- a/src/unexsunos4.c +++ b/src/unexsunos4.c @@ -1,6 +1,6 @@ /* Unexec for Sunos 4 using shared libraries. Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexw32.c b/src/unexw32.c index bc462c18a10..6256062aa3f 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -1,5 +1,6 @@ /* unexec for GNU Emacs on Windows NT. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/vm-limit.c b/src/vm-limit.c index 0c12dec9b04..fb127b27b74 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -1,6 +1,6 @@ /* Functions for memory limit warnings. Copyright (C) 1990, 1992, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w16select.c b/src/w16select.c index c2c08666da9..50c107a0789 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -1,6 +1,6 @@ /* 16-bit Windows Selection processing for emacs on MS-Windows Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.c b/src/w32.c index 9860a6cc353..799a3f6ad9b 100644 --- a/src/w32.c +++ b/src/w32.c @@ -1,6 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API. Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.h b/src/w32.h index 2981e5bb979..ecc986269fb 100644 --- a/src/w32.h +++ b/src/w32.h @@ -2,7 +2,8 @@ #define EMACS_W32_H /* Support routines for the NT version of Emacs. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.c b/src/w32bdf.c index 37b892216d1..fbdb7f4c373 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c @@ -1,5 +1,6 @@ /* Implementation of BDF font handling on the Microsoft W32 API. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.h b/src/w32bdf.h index 9d3d306d56f..dd8cfa276bf 100644 --- a/src/w32bdf.h +++ b/src/w32bdf.h @@ -1,5 +1,6 @@ /* Definitions and header for handling BDF fonts on the Microsoft W32 API. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32console.c b/src/w32console.c index 4009397a060..a696534a4b6 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -1,6 +1,6 @@ /* Terminal hooks for GNU Emacs on the Microsoft W32 API. Copyright (C) 1992, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32fns.c b/src/w32fns.c index a9fded5525e..1bb23cf19ea 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, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32gui.h b/src/w32gui.h index 644adcea924..2b1a11987f3 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -1,5 +1,6 @@ /* Definitions and headers for communication on the Microsoft W32 API. - Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.c b/src/w32heap.c index a0c50da5506..f1fa196abe7 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -1,5 +1,6 @@ /* Heap management routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.h b/src/w32heap.h index 1b3b815b115..c862558b1cf 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -1,5 +1,6 @@ /* Heap management routines (including unexec) for GNU Emacs on Windows NT. - Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.c b/src/w32inevt.c index ffa2cd0989a..0fededa6aea 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -1,6 +1,6 @@ /* Input event support for Emacs on the Microsoft W32 API. Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.h b/src/w32inevt.h index e0a9428720f..8985df1ee69 100644 --- a/src/w32inevt.h +++ b/src/w32inevt.h @@ -1,5 +1,6 @@ /* Input routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32menu.c b/src/w32menu.c index dfd885eee08..57db01ac9e9 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1,6 +1,6 @@ /* Menu support for GNU Emacs on the Microsoft W32 API. Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32proc.c b/src/w32proc.c index 628a763c675..a9e0e0cb83f 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -1,6 +1,6 @@ /* Process support for GNU Emacs on the Microsoft W32 API. Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32reg.c b/src/w32reg.c index 40d84df3d14..cd2a3bdf755 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -1,6 +1,6 @@ /* Emulate the X Resource Manager through the registry. Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32select.c b/src/w32select.c index 9ad9f96a4b6..7b394943434 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -1,6 +1,6 @@ /* Selection processing for Emacs on the Microsoft W32 API. Copyright (C) 1993, 1994, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.c b/src/w32term.c index 8084685cf48..5a90cb4a9ee 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, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.h b/src/w32term.h index 721e427beec..c9d7fc375ac 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -1,6 +1,6 @@ /* Definitions and headers for communication on the Microsoft W32 API. Copyright (C) 1995, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -248,9 +248,6 @@ extern Lisp_Object w32_display_name_list; /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ extern Lisp_Object Vx_pixel_size_width_font_regexp; -/* A flag to control how to display unibyte 8-bit character. */ -extern int unibyte_display_via_language_environment; - struct w32_display_info *x_display_info_for_name (); Lisp_Object display_x_get_resource P_ ((struct w32_display_info *, diff --git a/src/w32xfns.c b/src/w32xfns.c index 46a71b942c7..0e937e9950c 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -1,6 +1,6 @@ /* Functions taken directly from X sources for use with the Microsoft W32 API. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.c b/src/widget.c index 0386890d93b..35bf5631b20 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,6 +1,6 @@ /* The emacs frame widget. Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.h b/src/widget.h index 00d743234c0..b6c5e9f0bcb 100644 --- a/src/widget.h +++ b/src/widget.h @@ -1,5 +1,6 @@ /* The emacs frame widget public header file. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widgetprv.h b/src/widgetprv.h index 2027b4f602d..bde384d3b5f 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -1,5 +1,6 @@ /* The emacs frame widget private header file. - Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.c b/src/window.c index 289cc1628eb..f71d26f6d50 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, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfaces.c b/src/xfaces.c index ba1bbe7f1f6..0d91f433fce 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, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfns.c b/src/xfns.c index 48883733404..24dd26bd469 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, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xmenu.c b/src/xmenu.c index 816f8307850..a311a1cfa6a 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, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xrdb.c b/src/xrdb.c index 822fb6e2624..2b7888ebe84 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -1,6 +1,6 @@ /* Deal with the X Resource Manager. Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -88,6 +88,10 @@ extern char *get_system_name (); /* Make sure not to #include anything after these definitions. Let's not step on anyone's prototypes. */ #ifdef emacs +/* darwin.h may have already defined these. */ +#undef malloc +#undef realloc +#undef free #define malloc xmalloc #define realloc xrealloc #define free xfree diff --git a/src/xselect.c b/src/xselect.c index b41a05825ae..850cb058e86 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, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xsmfns.c b/src/xsmfns.c index e7f3e6fa3e5..a862a07c8ee 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, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.h b/src/xterm.h index d3e896e27b3..db8ae425a12 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, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -419,9 +419,6 @@ extern Lisp_Object x_display_name_list; /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ extern Lisp_Object Vx_pixel_size_width_font_regexp; -/* A flag to control how to display unibyte 8-bit character. */ -extern int unibyte_display_via_language_environment; - extern struct x_display_info *x_display_info_for_display P_ ((Display *)); extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); |