287 files changed, 648 insertions, 390 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 0d1f51e5d54..2cdb9fc7511 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 166222ae33c..8c1fffe9911 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,90 @@
+2006-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (Venable_disabled_menus_and_buttons): New variable.
+        (syms_of_keyboard): DEVFAR_LISP and initialize it.
+        (parse_tool_bar_item, parse_menu_item): If that variable is
+        non-nil, don't disable menu items and tool-bar buttons.
+
+2006-02-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * doc.c (Fsubstitute_command_keys): Doc fix.
+
+2006-02-10  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * data.c (Findirect_function): Rewrite docstring.
+        Fix omission bug: Declare new arg NOERROR.
+
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (x_set_mouse_color): Don't call rif->define_frame_cursor
+        if window_desc is not set yet.
+        (Fx_create_frame): Remove variable x_frame_name.  Apply 2005-12-07
+        and 2006-01-26 changes for xfns.c.  Call x_iconify_frame if frame
+        parameter `visibility' is `icon'.
+        (Fx_create_frame, x_create_tip_frame): Use "fontset-standard"
+        instead of "fontset-mac".
+        (Fx_focus_frame): New defun.
+        (syms_of_macfns): Defsubr it.
+
+        * macterm.c (mac_define_frame_cursor): Don't change pointer shape
+        for unfocused frame.
+        (x_raise_frame): Call BringToFront instead of SelectWindow.
+        (x_lower_frame): Use NULL instead of nil.
+        (x_make_frame_visible): Don't call SelectWindow.
+        (XTread_socket): Increment handling_signal at the start, decrement
+        it at the end.
+        [USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): Use
+        CFPreferencesGetAppIntegerValue instead of Fmac_get_preference.
+
+2006-02-10  Kim F. Storm  <storm@cua.dk>
+
+        * data.c (Findirect_function): Add NOERROR arg.  All callers changed
+        to pass Qnil for NOERROR.
+
+        * keymap.c (current_minor_maps_error): Remove.
+        (current_minor_maps): Pass Qt for NOERROR to Findirect_function
+        instead of using internal_condition_case_1+current_minor_maps_error.
+
+2006-02-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Must note mouse movement even for nil
+        frames for GTK, in that case it is the tool bar.  This is so that
+        highlighted text get reset properly.
+
+2006-02-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * alloc.c (Fmake_bool_vector, Fpurecopy): Doc fixes.
+
+2006-02-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * window.c (adjust_window_trailing_edge): Check that shrinking
+        does not set a window to size zero or less.
+
+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 work 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.
@@ -22409,7 +22496,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 9329dddc516..32f339bb139 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 84054892910..e7dcec3a43a 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/alloc.c b/src/alloc.c
index be03f4ebf7c..27fe3f86961 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2301,7 +2301,7 @@ INIT must be an integer that represents a character.  */)
 
 
 DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0,
-       doc: /* Return a new bool-vector of length LENGTH, using INIT for as each element.
+       doc: /* Return a new bool-vector of length LENGTH, using INIT for each element.
 LENGTH must be a number.  INIT matters only in whether it is t or nil.  */)
      (length, init)
      Lisp_Object length, init;
@@ -4813,7 +4813,7 @@ make_pure_vector (len)
 
 
 DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0,
-       doc: /* Make a copy of OBJECT in pure storage.
+       doc: /* Make a copy of object OBJ in pure storage.
 Recursively copies contents of vectors and cons cells.
 Does not copy symbols.  Copies strings without text properties.  */)
      (obj)
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 d0719ec9481..dae07edf359 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 2387af65a47..737877f15de 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 af09061dbc3..0d06890eabf 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 38db2ea92ec..c54b03394c0 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 25861602c85..a6841317e63 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 dee68fcf8c0..02ec3f76b4e 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 a1e8b5a68fb..5c7530eb480 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 866a7cdd429..929cd7ea1c0 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 69658f779a7..779755cf39e 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 fb9804c0306..211de24ef89 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,5 +1,6 @@
 /* Basic multilingual character 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 d6b1dee187f..0d61aa054c0 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,5 +1,6 @@
 /* Header for multibyte character 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
diff --git a/src/cm.c b/src/cm.c
index 0044063dabb..0d49ca40204 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -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.
diff --git a/src/cm.h b/src/cm.h
index c2381f3c55e..b0d7f2ce84c 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -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 8f7e3bf02df..f1e92ab2f75 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 2358f3e13f3..2d5618649d1 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1,5 +1,6 @@
 /* Coding system handler (conversion, detection, and 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 609720b9751..5d649fbf9ff 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 54aa2ed9840..d3be3554c55 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 99db0506814..5c19f8aa56e 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 69c7543bfab..b6730d0284e 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 10d6a1e9eb5..d2f6ce76905 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.
 
@@ -1984,23 +1984,26 @@ indirect_function (object)
   return hare;
 }
 
-DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 1, 0,
+DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
        doc: /* Return the function at the end of OBJECT's function chain.
-If OBJECT is a symbol, follow all function indirections and return the final
-function binding.
-If OBJECT is not a symbol, just return it.
-Signal a void-function error if the final symbol is unbound.
+If OBJECT is not a symbol, just return it.  Otherwise, follow all
+function indirections to find the final function binding and return it.
+If the final symbol in the chain is unbound, signal a void-function error.
+Optional arg NOERROR non-nil means to return nil instead of signalling.
 Signal a cyclic-function-indirection error if there is a loop in the
 function chain of symbols.  */)
-     (object)
+     (object, noerror)
      register Lisp_Object object;
+     Lisp_Object noerror;
 {
   Lisp_Object result;
 
   result = indirect_function (object);
 
   if (EQ (result, Qunbound))
-    return Fsignal (Qvoid_function, Fcons (object, Qnil));
+    return (NILP (noerror)
+            ? Fsignal (Qvoid_function, Fcons (object, Qnil))
+            : Qnil);
   return result;
 }
 
diff --git a/src/dired.c b/src/dired.c
index 474683c3c87..8c7c7fd5ac6 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 b5a6b21d539..66ec02d724a 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.
 
@@ -2644,6 +2644,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 2f3deac5fcc..53ea761178f 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 41f4bcbfdbf..80936fb1830 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 0566c5f9d06..3dd5622d9df 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.
 
@@ -386,7 +386,7 @@ string is passed through `substitute-command-keys'.  */)
           !NILP (tem)))
     return Fdocumentation_property (function, Qfunction_documentation, raw);
 
-  fun = Findirect_function (function);
+  fun = Findirect_function (function, Qnil);
   if (SUBRP (fun))
     {
       if (XSUBR (fun)->doc == 0)
@@ -739,7 +739,7 @@ Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke
 sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not
 on any keys.
 Substrings of the form \\=\\{MAPVAR} are replaced by summaries
-\(made by describe-bindings) of the value of MAPVAR, taken as a keymap.
+\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap.
 Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
 as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
diff --git a/src/doprnt.c b/src/doprnt.c
index 5d824038faf..63c0261e6ae 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 c256595cc13..22aaa62f0d1 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 5bf4eb738ae..b621397eda3 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.
 
@@ -739,24 +739,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..eff284820f0 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.
 
@@ -618,7 +618,7 @@ interactive_p (exclude_subrs_p)
 
   /* If this isn't a byte-compiled function, there may be a frame at
      the top for Finteractive_p.  If so, skip it.  */
-  fun = Findirect_function (*btp->function);
+  fun = Findirect_function (*btp->function, Qnil);
   if (SUBRP (fun) && (XSUBR (fun) == &Sinteractive_p
                       || XSUBR (fun) == &Scalled_interactively_p))
     btp = btp->next;
@@ -639,7 +639,7 @@ interactive_p (exclude_subrs_p)
      a special form, ignoring frames for Finteractive_p and/or
      Fbytecode at the top.  If this frame is for a built-in function
      (such as load or eval-region) return nil.  */
-  fun = Findirect_function (*btp->function);
+  fun = Findirect_function (*btp->function, Qnil);
   if (exclude_subrs_p && SUBRP (fun))
     return 0;
 
@@ -2079,7 +2079,7 @@ do_autoload (fundef, funname)
   Vautoload_queue = Qt;
   unbind_to (count, Qnil);
 
-  fun = Findirect_function (fun);
+  fun = Findirect_function (fun, Qnil);
 
   if (!NILP (Fequal (fun, fundef)))
     error ("Autoloading failed to define function %s",
@@ -2142,7 +2142,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
   /* At this point, only original_fun and original_args
      have values that will be used below */
  retry:
-  fun = Findirect_function (original_fun);
+  fun = Findirect_function (original_fun, Qnil);
 
   if (SUBRP (fun))
     {
@@ -2841,7 +2841,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
 
   fun = args[0];
 
-  fun = Findirect_function (fun);
+  fun = Findirect_function (fun, Qnil);
 
   if (SUBRP (fun))
     {
diff --git a/src/filelock.c b/src/filelock.c
index fc6839f5f88..6e8e6da9fbd 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 48048c5a830..d16222e6fa5 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 871ce9926f7..23f3c57d241 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 aaf12facf94..a4360280911 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 c9061423193..34508a6d2fb 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 cf0e50ed623..ae80c03f9ca 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 8c6d47cbade..991df3bd60d 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 0ed50ac6539..3587515f840 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 6ca15c67345..9b5a9e32c79 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 a63dce14928..b9d9574788e 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 07845f95666..8bbab5a2a28 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 418520b5c25..052b55d5a3c 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 dc509ad5717..319e6d24974 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.
 
@@ -633,6 +633,11 @@ static EMACS_TIME timer_idleness_start_time;
 
 static EMACS_TIME timer_last_idleness_start_time;
 
+/* If non-nil, events produced by disabled menu items and tool-bar
+   buttons are not ignored.  Help functions bind this to allow help on
+   those items and buttons.  */
+Lisp_Object Venable_disabled_menus_and_buttons;
+
 
 /* Global variable declarations.  */
 
@@ -7453,7 +7458,9 @@ parse_menu_item (item, notreal, inmenubar)
       if (SYMBOLP (item))
         {
           tem = Fget (item, Qmenu_enable);
-          if (!NILP (tem))
+          if (!NILP (Venable_disabled_menus_and_buttons))
+            AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt;
+          else if (!NILP (tem))
             AREF (item_properties, ITEM_PROPERTY_ENABLE) = tem;
         }
     }
@@ -7482,7 +7489,12 @@ parse_menu_item (item, notreal, inmenubar)
               item = XCDR (item);
 
               if (EQ (tem, QCenable))
-                AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item);
+                {
+                  if (!NILP (Venable_disabled_menus_and_buttons))
+                    AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt;
+                  else
+                    AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item);
+                }
               else if (EQ (tem, QCvisible) && !notreal)
                 {
                   /* If got a visible property and that evaluates to nil
@@ -8002,8 +8014,13 @@ parse_tool_bar_item (key, item)
       value = XCAR (XCDR (item));
 
       if (EQ (key, QCenable))
-        /* `:enable FORM'.  */
-        PROP (TOOL_BAR_ITEM_ENABLED_P) = value;
+        {
+          /* `:enable FORM'.  */
+          if (!NILP (Venable_disabled_menus_and_buttons))
+            PROP (TOOL_BAR_ITEM_ENABLED_P) = Qt;
+          else
+            PROP (TOOL_BAR_ITEM_ENABLED_P) = value;
+        }
       else if (EQ (key, QCvisible))
         {
           /* `:visible FORM'.  If got a visible property and that
@@ -9907,7 +9924,7 @@ a special event, so ignore the prefix argument and don't clear it.  */)
 
   while (1)
     {
-      final = Findirect_function (cmd);
+      final = Findirect_function (cmd, Qnil);
 
       if (CONSP (final) && (tem = Fcar (final), EQ (tem, Qautoload)))
         {
@@ -11934,6 +11951,14 @@ If the value is not a number, such messages don't time out.  */);
 The value of that variable is passed to `quit-flag' and later causes a
 peculiar kind of quitting.  */);
   Vthrow_on_input = Qnil;
+
+  DEFVAR_LISP ("enable-disabled-menus-and-buttons",
+               &Venable_disabled_menus_and_buttons,
+               doc: /* If non-nil, don't ignore events produced by disabled menu items and tool-bar.
+
+Help functions bind this to allow help on disabled menu items
+and tool-bar buttons.  */);
+  Venable_disabled_menus_and_buttons = Qnil;
 }
 
 void
diff --git a/src/keyboard.h b/src/keyboard.h
index 19a38ed7446..a3fa54b1042 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 fa64e88d6e5..ca8edab122b 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.
 
@@ -69,7 +69,7 @@ Lisp_Object Vminibuffer_local_completion_map;
 /* keymap used for minibuffers when doing completion in filenames */
 Lisp_Object Vminibuffer_local_filename_completion_map;
 
-/* keymap used for minibuffers when doing completion in filenames 
+/* keymap used for minibuffers when doing completion in filenames
    with require-match*/
 Lisp_Object Vminibuffer_local_must_match_filename_map;
 
@@ -1363,13 +1363,6 @@ silly_event_symbol_error (c)
 static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL;
 static int cmm_size = 0;
 
-/* Error handler used in current_minor_maps.  */
-static Lisp_Object
-current_minor_maps_error ()
-{
-  return Qnil;
-}
-
 /* Store a pointer to an array of the keymaps of the currently active
    minor modes in *buf, and return the number of maps it contains.
 
@@ -1471,9 +1464,7 @@ current_minor_maps (modeptr, mapptr)
               }
 
             /* Get the keymap definition--or nil if it is not defined.  */
-            temp = internal_condition_case_1 (Findirect_function,
-                                              XCDR (assoc),
-                                              Qerror, current_minor_maps_error);
+            temp = Findirect_function (XCDR (assoc), Qt);
             if (!NILP (temp))
               {
                 cmm_modes[i] = var;
@@ -3875,11 +3866,11 @@ don't alter it yourself.  */);
   Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil);
   Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map);
 
-  DEFVAR_LISP ("minibuffer-local-filename-completion-map", 
+  DEFVAR_LISP ("minibuffer-local-filename-completion-map",
                &Vminibuffer_local_filename_completion_map,
                doc: /* Local keymap for minibuffer input with completion for filenames.  */);
   Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_filename_completion_map, 
+  Fset_keymap_parent (Vminibuffer_local_filename_completion_map,
                       Vminibuffer_local_completion_map);
 
 
@@ -3889,11 +3880,11 @@ don't alter it yourself.  */);
   Fset_keymap_parent (Vminibuffer_local_must_match_map,
                       Vminibuffer_local_completion_map);
 
-  DEFVAR_LISP ("minibuffer-local-must-match-filename-map", 
+  DEFVAR_LISP ("minibuffer-local-must-match-filename-map",
                &Vminibuffer_local_must_match_filename_map,
                doc: /* Local keymap for minibuffer input with completion for filenames with exact match.  */);
   Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, 
+  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map,
                       Vminibuffer_local_must_match_map);
 
   DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,
diff --git a/src/keymap.h b/src/keymap.h
index a6598558a76..3170877f497 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 66dcdeb00da..63c643604d1 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.
 
@@ -2179,7 +2179,7 @@ EXFUN (Fsymbol_function, 1);
 EXFUN (Fsymbol_plist, 1);
 EXFUN (Fsymbol_name, 1);
 extern Lisp_Object indirect_function P_ ((Lisp_Object));
-EXFUN (Findirect_function, 1);
+EXFUN (Findirect_function, 2);
 EXFUN (Ffset, 2);
 EXFUN (Fsetplist, 2);
 EXFUN (Fsymbol_value, 1);
diff --git a/src/lread.c b/src/lread.c
index 590ff65bbce..a23278b63ab 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.
 
@@ -1081,7 +1081,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 110b697ce5e..b6ef85bcd9f 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.
 
@@ -1448,7 +1448,8 @@ x_set_mouse_color (f, arg, oldval)
 
   BLOCK_INPUT;
 
-  rif->define_frame_cursor (f, cursor);
+  if (FRAME_MAC_WINDOW (f) != 0)
+    rif->define_frame_cursor (f, cursor);
 
   f->output_data.mac->text_cursor = cursor;
   f->output_data.mac->nontext_cursor = nontext_cursor;
@@ -2398,11 +2399,12 @@ This function is an internal primitive--use `make-frame' instead.  */)
   struct mac_display_info *dpyinfo = NULL;
   Lisp_Object parent;
   struct kboard *kb;
-  char x_frame_name[10];
   static int x_frame_count = 2;  /* begins at 2 because terminal frame is F1 */
 
   check_mac ();
 
+  parms = Fcopy_alist (parms);
+
   /* Use this general default value to start with
      until we know if this frame has a specified name.  */
   Vx_resource_name = Vinvocation_name;
@@ -2452,18 +2454,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
   else
     f = make_frame (1);
 
-  if (EQ (name, Qunbound) || NILP (name))
-    {
-      sprintf (x_frame_name, "F%d", x_frame_count++);
-      f->name = build_string (x_frame_name);
-      f->explicit_name = 0;
-    }
-  else
-    {
-      f->name = name;
-      f->explicit_name = 1;
-    }
-
   XSETFRAME (frame, f);
 
   /* Note that X Windows does support scroll bars.  */
@@ -2544,7 +2534,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
       font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
     /* If those didn't work, look for something which will at least work.  */
     if (! STRINGP (font))
-      font = x_new_fontset (f, "fontset-mac");
+      font = x_new_fontset (f, "fontset-standard");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))
@@ -2679,17 +2669,28 @@ This function is an internal primitive--use `make-frame' instead.  */)
       if (EQ (visibility, Qunbound))
         visibility = Qt;
 
-#if 0 /* MAC_TODO: really no iconify on Mac */
       if (EQ (visibility, Qicon))
         x_iconify_frame (f);
-      else
-#endif
-      if (! NILP (visibility))
+      else if (! NILP (visibility))
         x_make_frame_visible (f);
       else
         /* Must have been Qnil.  */
         ;
     }
+
+  /* Initialize `default-minibuffer-frame' in case this is the first
+     frame on this display device.  */
+  if (FRAME_HAS_MINIBUF_P (f)
+      && (!FRAMEP (kb->Vdefault_minibuffer_frame)
+          || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))))
+    kb->Vdefault_minibuffer_frame = frame;
+
+  /* All remaining specified parameters, which have not been "used"
+     by x_get_arg and friends, now go in the misc. alist of the frame.  */
+  for (tem = parms; !NILP (tem); tem = XCDR (tem))
+    if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
+      f->param_alist = Fcons (XCAR (tem), f->param_alist);
+
   UNGCPRO;
 
   /* Make sure windows on this frame appear in calls to next-window
@@ -2699,9 +2700,11 @@ This function is an internal primitive--use `make-frame' instead.  */)
   return unbind_to (count, frame);
 }
 
+
 /* FRAME is used only to get a handle on the X display.  We don't pass the
    display info directly because we're called from frame.c, which doesn't
    know about that structure.  */
+
 Lisp_Object
 x_get_focus_frame (frame)
      struct frame *frame;
@@ -2714,6 +2717,39 @@ x_get_focus_frame (frame)
   XSETFRAME (xfocus, dpyinfo->x_focus_frame);
   return xfocus;
 }
+
+
+DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
+       doc: /* Set the input focus to FRAME.
+FRAME nil means use the selected frame.  */)
+     (frame)
+     Lisp_Object frame;
+{
+  struct frame *f = check_x_frame (frame);
+  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
+
+  if (dpyinfo->x_focus_frame != f)
+    {
+      BLOCK_INPUT;
+#ifdef MAC_OSX
+      ActivateWindow (ActiveNonFloatingWindow (), false);
+      ActivateWindow (FRAME_MAC_WINDOW (f), true);
+#else
+#if !TARGET_API_MAC_CARBON
+      /* SelectWindow (Non-Carbon) does not issue deactivate events if
+         the possibly inactive window that is to be selected is
+         already the frontmost one.  */
+      SendBehind (FRAME_MAC_WINDOW (f), NULL);
+#endif
+      /* This brings the window to the front.  */
+      SelectWindow (FRAME_MAC_WINDOW (f));
+#endif
+      UNBLOCK_INPUT;
+    }
+
+  return Qnil;
+}
+
 
 DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
        doc: /* Internal function called by `color-defined-p', which see.  */)
@@ -3664,7 +3700,7 @@ x_create_tip_frame (dpyinfo, parms, text)
       font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
     /* If those didn't work, look for something which will at least work.  */
     if (! STRINGP (font))
-      font = x_new_fontset (f, "fontset-mac");
+      font = x_new_fontset (f, "fontset-standard");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))
@@ -4513,6 +4549,7 @@ Chinese, Japanese, and Korean.  */);
   defsubr (&Sx_close_connection);
   defsubr (&Sx_display_list);
   defsubr (&Sx_synchronize);
+  defsubr (&Sx_focus_frame);
 
   /* Setting callback functions for fontset handler.  */
   get_font_info_func = x_get_font_info;
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 218b1652df2..a0c4f298e66 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.
 
@@ -1026,12 +1026,15 @@ static int cg_text_anti_aliasing_threshold = 8;
 static void
 init_cg_text_anti_aliasing_threshold ()
 {
-  Lisp_Object val =
-    Fmac_get_preference (build_string ("AppleAntiAliasingThreshold"),
-                         Qnil, Qnil, Qnil);
+  int threshold;
+  Boolean valid_p;
 
-  if (INTEGERP (val))
-    cg_text_anti_aliasing_threshold = XINT (val);
+  threshold =
+    CFPreferencesGetAppIntegerValue (CFSTR ("AppleAntiAliasingThreshold"),
+                                     kCFPreferencesCurrentApplication,
+                                     &valid_p);
+  if (valid_p)
+    cg_text_anti_aliasing_threshold = threshold;
 }
 
 static int
@@ -5299,7 +5302,10 @@ mac_define_frame_cursor (f, cursor)
      struct frame *f;
      Cursor cursor;
 {
-  SetThemeCursor (cursor);
+  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
+
+  if (dpyinfo->x_focus_frame == f)
+    SetThemeCursor (cursor);
 }
 
 
@@ -5837,7 +5843,7 @@ x_raise_frame (f)
   if (f->async_visible)
     {
       BLOCK_INPUT;
-      SelectWindow (FRAME_MAC_WINDOW (f));
+      BringToFront (FRAME_MAC_WINDOW (f));
       UNBLOCK_INPUT;
     }
 }
@@ -5851,7 +5857,7 @@ x_lower_frame (f)
   if (f->async_visible)
     {
       BLOCK_INPUT;
-      SendBehind (FRAME_MAC_WINDOW (f), nil);
+      SendBehind (FRAME_MAC_WINDOW (f), NULL);
       UNBLOCK_INPUT;
     }
 }
@@ -5964,7 +5970,6 @@ x_make_frame_visible (f)
 
       f->output_data.mac->asked_for_visible = 1;
 
-      SelectWindow (FRAME_MAC_WINDOW (f));
       CollapseWindow (FRAME_MAC_WINDOW (f), false);
       ShowWindow (FRAME_MAC_WINDOW (f));
     }
@@ -9581,6 +9586,8 @@ XTread_socket (sd, expected, hold_quit)
   /* So people can tell when we have read the available input.  */
   input_signal_count++;
 
+  ++handling_signal;
+
 #if USE_CARBON_EVENTS
   toolbox_dispatcher = GetEventDispatcherTarget ();
 
@@ -10221,6 +10228,7 @@ XTread_socket (sd, expected, hold_quit)
   }
 #endif
 
+  --handling_signal;
   UNBLOCK_INPUT;
   return count;
 }
diff --git a/src/macterm.h b/src/macterm.h
index 2f2ae26b3b3..107814ddb3f 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 76ad4624712..a94938a0b80 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 36a048537f7..79a7d702bdf 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 b9bbaf5b186..300e2e2ccb5 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 4ea4ab0cf1d..9ac34e008c4 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 c2f6303786f..1f2632c6913 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 e8fcd2b6a45..28e9e86177e 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 4046fae40fd..c58beaea45a 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 a8a07f052f1..18f0a794269 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 da0ab3e78d1..c850c640b36 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 04db528cc64..9b04f47c16b 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 e12bf69d2a1..04b58c78d3f 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 251cc553cdf..3f668eac946 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 c29e26c20b5..92d55967b33 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 25db4c73080..6e09748bca9 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 3cb28220962..ac77759d258 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 899739de6ae..b1183ed9e2a 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.
 
@@ -1328,10 +1328,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)
@@ -1351,7 +1351,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);
@@ -1402,6 +1402,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;
@@ -1431,13 +1434,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;
@@ -1445,14 +1446,30 @@ produce_glyphs (it)
     }
   else if (SINGLE_BYTE_CHAR_P (it->c))
     {
-      /* Coming here means that it->c is from display table, thus we
-         must send the code as is to the terminal.  Although there's
-         no way to know how many columns it occupies on a screen, it
-         is a good assumption that a single byte code has 1-column
-         width.  */
-      it->pixel_width = it->nglyphs = 1;
-      if (it->glyph_row)
-        append_glyph (it);
+      if (unibyte_display_via_language_environment
+          && (it->c >= 0240
+              || !NILP (Vnonascii_translation_table)))
+        {
+          int charset;
+
+          it->char_to_display = unibyte_char_to_multibyte (it->c);
+          charset = CHAR_CHARSET (it->char_to_display);
+          it->pixel_width = CHARSET_WIDTH (charset);
+          it->nglyphs = it->pixel_width;
+          if (it->glyph_row)
+            append_glyph (it);
+        }
+      else
+        {
+          /* Coming here means that it->c is from display table, thus we
+             must send the code as is to the terminal.  Although there's
+             no way to know how many columns it occupies on a screen, it
+             is a good assumption that a single byte code has 1-column
+             width.  */
+          it->pixel_width = it->nglyphs = 1;
+          if (it->glyph_row)
+            append_glyph (it);
+        }
     }
   else
     {
@@ -1537,17 +1554,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 9e9819b97ce..c0d9895462e 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 7045d6ee1e3..13b41f95f70 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,6 +1,6 @@
 /* Parameters and display hooks for terminal devices.
    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 2e5da3c9948..8d776b3de38 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 b0c30eb58d8..cd3098bae52 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 10780f2f0c9..89d88574188 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 a81591fb96f..dbadee3b10d 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 b82814bca72..34450fd5219 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 3556c62a35f..99825c23911 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 79f6ae5206b..0017d2a5c86 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 34932c44d3b..f587d74a485 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 25656307648..58ab3ee14a0 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.
 
@@ -4286,6 +4286,14 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
         {
           if (!NILP (XWINDOW (window)->next))
             {
+              /* This may happen for the minibuffer.  In that case
+                 the window_deletion_count check below does not work.  */
+              if (XINT (CURSIZE (p->next)) - delta <= 0) 
+                {
+                  Fset_window_configuration (old_config);
+                  error ("Cannot adjust window size as specified");
+                }
+
               XSETINT (CURBEG (p->next),
                        XINT (CURBEG (p->next)) + delta);
               size_window (p->next, XINT (CURSIZE (p->next)) - delta,
diff --git a/src/xfaces.c b/src/xfaces.c
index 7c9230f1140..27edd1a45dc 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 e478bde7984..b8f128b6cdc 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 70c07702cae..ddb93aa8c77 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 0a138687d7b..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.
 
diff --git a/src/xselect.c b/src/xselect.c
index 062336bc050..71232ee87ba 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 008b50fc489..974b3a1c6ad 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.c b/src/xterm.c
index a71ffd75e70..27abaebdb83 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6508,6 +6508,12 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
          so update things that depend on mouse position.  */
       if (f && !f->output_data.x->hourglass_p)
         note_mouse_movement (f, &event.xmotion);
+#ifdef USE_GTK
+      /* We may get an EnterNotify on the buttons in the toolbar.  In that
+         case we moved out of any highlighted area and need to note this.  */
+      if (!f && last_mouse_glyph_frame)
+        note_mouse_movement (last_mouse_glyph_frame, &event);
+#endif
       goto OTHER;
 
     case FocusIn:
@@ -6535,6 +6541,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           if (any_help_event_p)
             do_help = -1;
         }
+#ifdef USE_GTK
+      /* See comment in EnterNotify above */
+      else if (last_mouse_glyph_frame)
+        note_mouse_movement (last_mouse_glyph_frame, &event);
+#endif
       goto OTHER;
 
     case FocusOut:
diff --git a/src/xterm.h b/src/xterm.h
index dfb79d9d90f..78d9bc8871c 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));