Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-599
   Merge from erc--main--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-600
   Merge from erc--main--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-601
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-602
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-603
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-604
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-605
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-606
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-607
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-608
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-609
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-610
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-611
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-612
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-613
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-614
   Make byte compiler correctly write circular constants

 * emacs@sv.gnu.org/emacs--devo--0--patch-615
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-616
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-617
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-618
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-192
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-193
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-194
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-195
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-196
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-594

307 files changed, 1342 insertions, 1424 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 0561d53a937..8d8c163b3b6 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1,5 +1,5 @@
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
-#   2004, 2005, 2006 Free Software Foundation, Inc.
+#   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -158,7 +158,8 @@ define ppt
   printf " SZ=%d\n", $t->gap_size
 end
 document ppt
-Print point, beg, end, narrow, and gap for current buffer.
+Print current buffer's point and boundaries.
+Prints values of point, beg, end, narrow, and gap for current buffer.
 end
 
 # Print out iterator given as first arg
@@ -312,7 +313,7 @@ define pcursorx
   printf "y=%d x=%d vpos=%d hpos=%d", $cp->y, $cp->x, $cp->vpos, $cp->hpos
 end
 document pcursorx
-Pretty print a window cursor
+Pretty print a window cursor.
 end
 
 define pcursor
@@ -321,7 +322,7 @@ define pcursor
   printf "\n"
 end
 document pcursor
-Pretty print the output_cursor
+Pretty print the output_cursor.
 end
 
 define pwinx
@@ -381,7 +382,7 @@ define pwinx
 end
 document pwinx
 Pretty print a window structure.
-Takes one argument, a pointer to a window structure
+Takes one argument, a pointer to a window structure.
 end
 
 define pwin
@@ -447,7 +448,7 @@ define pgx
 end
 document pgx
 Pretty print a glyph structure.
-Takes one argument, a pointer to a glyph structure
+Takes one argument, a pointer to a glyph structure.
 end
 
 define pg
@@ -532,7 +533,8 @@ define xvectype
   echo \n
 end
 document xvectype
-Print the size or vector subtype of $, assuming it is a vector or pseudovector.
+Print the size or vector subtype of $.
+This command assumes that $ is a vector or pseudovector.
 end
 
 define xmisctype
@@ -541,7 +543,7 @@ define xmisctype
   echo \n
 end
 document xmisctype
-Print the specific type of $, assuming it is some misc type.
+Assume that $ is some misc type and print its specific type.
 end
 
 define xint
@@ -549,7 +551,7 @@ define xint
   print $int
 end
 document xint
-Print $, assuming it is an Emacs Lisp integer.  This gets the sign right.
+Print $ as an Emacs Lisp integer.  This gets the sign right.
 end
 
 define xptr
@@ -557,7 +559,7 @@ define xptr
   print (void *) $ptr
 end
 document xptr
-Print the pointer portion of $, assuming it is an Emacs Lisp value.
+Print the pointer portion of an Emacs Lisp value in $.
 end
 
 define xmarker
@@ -565,7 +567,8 @@ define xmarker
   print (struct Lisp_Marker *) $ptr
 end
 document xmarker
-Print $ as a marker pointer, assuming it is an Emacs Lisp marker value.
+Print $ as a marker pointer.
+This command assumes that $ is an Emacs Lisp marker value.
 end
 
 define xoverlay
@@ -573,7 +576,8 @@ define xoverlay
   print (struct Lisp_Overlay *) $ptr
 end
 document xoverlay
-Print $ as a overlay pointer, assuming it is an Emacs Lisp overlay value.
+Print $ as a overlay pointer.
+This command assumes that $ is an Emacs Lisp overlay value.
 end
 
 define xmiscfree
@@ -581,7 +585,8 @@ define xmiscfree
   print (struct Lisp_Free *) $ptr
 end
 document xmiscfree
-Print $ as a misc free-cell pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a misc free-cell pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xintfwd
@@ -589,7 +594,8 @@ define xintfwd
   print (struct Lisp_Intfwd *) $ptr
 end
 document xintfwd
-Print $ as an integer forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as an integer forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xboolfwd
@@ -597,7 +603,8 @@ define xboolfwd
   print (struct Lisp_Boolfwd *) $ptr
 end
 document xboolfwd
-Print $ as a boolean forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a boolean forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xobjfwd
@@ -605,7 +612,8 @@ define xobjfwd
   print (struct Lisp_Objfwd *) $ptr
 end
 document xobjfwd
-Print $ as an object forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as an object forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xbufobjfwd
@@ -613,7 +621,8 @@ define xbufobjfwd
   print (struct Lisp_Buffer_Objfwd *) $ptr
 end
 document xbufobjfwd
-Print $ as a buffer-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a buffer-local object forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xkbobjfwd
@@ -621,7 +630,8 @@ define xkbobjfwd
   print (struct Lisp_Kboard_Objfwd *) $ptr
 end
 document xkbobjfwd
-Print $ as a kboard-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a kboard-local object forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xbuflocal
@@ -629,7 +639,8 @@ define xbuflocal
   print (struct Lisp_Buffer_Local_Value *) $ptr
 end
 document xbuflocal
-Print $ as a buffer-local-value pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a buffer-local-value pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xsymbol
@@ -673,7 +684,8 @@ define xprocess
   echo \n
 end
 document xprocess
-Print the address of the struct Lisp_process which the Lisp_Object $ points to.
+Print the address of the struct Lisp_process to which $ points.
+This command assumes that $ is a Lisp_Object.
 end
 
 define xframe
@@ -685,7 +697,8 @@ define xframe
   echo \n
 end
 document xframe
-Print $ as a frame pointer, assuming it is an Emacs Lisp frame value.
+Print $ as a frame pointer.
+This command assumes $ is an Emacs Lisp frame value.
 end
 
 define xcompiled
@@ -694,7 +707,8 @@ define xcompiled
   output ($->contents[0])@($->size & 0xff)
 end
 document xcompiled
-Print $ as a compiled function pointer, assuming it is an Emacs Lisp compiled value.
+Print $ as a compiled function pointer.
+This command assumes that $ is an Emacs Lisp compiled value.
 end
 
 define xwindow
@@ -721,7 +735,8 @@ define xwinconfig
   print (struct save_window_data *) $ptr
 end
 document xwinconfig
-Print $ as a window configuration pointer, assuming it is an Emacs Lisp window configuration value.
+Print $ as a window configuration pointer.
+This command assumes that $ is an Emacs Lisp window configuration value.
 end
 
 define xsubr
@@ -766,8 +781,8 @@ define xbuffer
   echo \n
 end
 document xbuffer
-Set $ as a buffer pointer, assuming it is an Emacs Lisp buffer value.
-Print the name of the buffer.
+Set $ as a buffer pointer and the name of the buffer.
+This command assumes $ is an Emacs Lisp buffer value.
 end
 
 define xhashtable
@@ -775,7 +790,8 @@ define xhashtable
   print (struct Lisp_Hash_Table *) $ptr
 end
 document xhashtable
-Set $ as a hash table pointer, assuming it is an Emacs Lisp hash table value.
+Set $ as a hash table pointer.
+This command assumes that $ is an Emacs Lisp hash table value.
 end
 
 define xcons
@@ -785,7 +801,7 @@ define xcons
   echo \n
 end
 document xcons
-Print the contents of $, assuming it is an Emacs Lisp cons.
+Print the contents of $ as an Emacs Lisp cons.
 end
 
 define nextcons
@@ -794,7 +810,7 @@ define nextcons
 end
 document nextcons
 Print the contents of the next cell in a list.
-This assumes that the last thing you printed was a cons cell contents
+This command assumes that the last thing you printed was a cons cell contents
 (type struct Lisp_Cons) or a pointer to one.
 end
 define xcar
@@ -803,7 +819,7 @@ define xcar
   print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->car : 0)
 end
 document xcar
-Print the car of $, assuming it is an Emacs Lisp pair.
+Assume that $ is an Emacs Lisp pair and print its car.
 end
 
 define xcdr
@@ -812,7 +828,7 @@ define xcdr
   print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.cdr : 0)
 end
 document xcdr
-Print the cdr of $, assuming it is an Emacs Lisp pair.
+Assume that $ is an Emacs Lisp pair and print its cdr.
 end
 
 define xlist
@@ -1007,7 +1023,7 @@ define which
   set debug_print (which_symbols ($arg0))
 end
 document which
-  Print symbols which references a given lisp object,
+  Print symbols which references a given lisp object
   either as its symbol value or symbol function.
 end
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 1974d45dd2c..dd133046747 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,151 @@
+2007-01-28  Richard Stallman  <rms@gnu.org>
+
+        * minibuf.c (Ftry_completion, Fall_completions)
+        (Fcompleting_read, Ftest_completion):
+        Rename arg ALIST or TABLE to COLLECTION.
+
+2007-01-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * unexhp9k800.c: Remove due to lack of legal papers.
+
+        * m/sr2k.h, m/hp800.h: Remove due to dependence on above.
+
+2007-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (Fthis_command_keys, Fthis_command_keys_vector): Doc fix.
+
+        * minibuf.c (Fcompleting_read): Doc fix.
+
+2007-01-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_initialize): Call XftInit if HAVE_XFT.
+
+        * Makefile.in: Use XFT_LIBS if defined.
+
+2007-01-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * alloc.c (BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Use
+        BLOCK_INPUT/UNBLOCK_INPUT.
+
+        * blockinput.h (interrupt_input_blocked): Declare volatile.
+
+        * keyboard.c (interrupt_input_blocked): Declare volatile.
+
+        * syssignal.h (SIGNAL_THREAD_CHECK): Use pthread_equal.
+
+2007-01-24  Kim F. Storm  <storm@cua.dk>
+
+        * keymap.c (describe_map): Don't consider prefix keys to be shadowed.
+
+2007-01-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * editfns.c (Finsert_char): Doc fix.
+        (Fget_internal_run_time, Fdecode_time): Fix typos in docstrings.
+
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Don't
+        pass keyboard modifiers to mac_store_drag_event, but put them as
+        kEventParamKeyModifiers Apple event parameter.
+
+2007-01-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (try_window): Revert previous change.
+
+        * dispnew.c (update_text_area): Revert 2006-09-17 change.
+        Always redraw non-mode-line rows with mouse-face.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (try_window): Clear mouse-face highlights first.
+
+        * window.c (set_window_buffer): Revert 2006-11-22 change.
+
+2007-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit (ppt, xtype, xmisctype, xint, xptr, xmarker, xframe)
+        (xbuffer, xcons, xcar, xcdr): Fix doc strings.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (read_key_sequence): Extract local map only if the
+        given position is in an accessible buffer region.
+
+2007-01-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * .gdbinit: Reformat documentation so that first sentence
+        displays properly with "help user-defined" (like apropos).
+
+2007-01-18  Bruno Haible  <bruno@clisp.org>  (tiny change)
+
+        * epaths.in: Move PATH_DOC from local/info to local/share/info.
+
+2007-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]:
+        Create movable modal window instead of movable alert window.
+        (create_and_show_dialog) [!MAC_OSX]: Use DeactivateControl instead
+        of DisableControl.
+
+        * macselect.c (Fmac_resume_apple_event): Set error number when
+        descriptor type of reply is non-null.
+
+2007-01-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Use
+        DisableControl for disabled items.  Set default button to first
+        enabled one.  Use icon of application in execution.
+
+2007-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c (Fdelete_process, Fprocess_id, sigchld_handler):
+        Copy PID into EMACS_INT to avoid GCC warnings.
+
+        * fns.c (maybe_resize_hash_table): Copy new size of hash table
+        into EMACS_INT to avoid GCC warnings.
+
+        * editfns.c (Fuser_uid, Fuser_real_uid): Copy values returned by
+        geteuid and getuid into EMACS_INT to avoid GCC warnings.
+
+        * dired.c (Ffile_attributes): Fix last change.
+
+2007-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.c (Ffile_attributes): Copy some members of `struct stat'
+        into int's to avoid GCC warnings about limited range of short in
+        arguments to FIXNUM_OVERFLOW_P.
+
+2007-01-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (HAVE_DIALOGS): Define if TARGET_API_MAC_CARBON.
+        (mac_handle_dialog_event, install_dialog_event_handler)
+        (create_and_show_dialog) [TARGET_API_MAC_CARBON]: New functions.
+        (DIALOG_LEFT_MARGIN, DIALOG_TOP_MARGIN, DIALOG_RIGHT_MARGIN)
+        (DIALOG_BOTTOM_MARGIN, DIALOG_MIN_INNER_WIDTH)
+        (DIALOG_MAX_INNER_WIDTH, DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE)
+        (DIALOG_BUTTON_BUTTON_VERTICAL_SPACE, DIALOG_BUTTON_MIN_WIDTH)
+        (DIALOG_TEXT_MIN_HEIGHT, DIALOG_TEXT_BUTTONS_VERTICAL_SPACE)
+        (DIALOG_ICON_WIDTH, DIALOG_ICON_HEIGHT, DIALOG_ICON_LEFT_MARGIN)
+        (DIALOG_ICON_TOP_MARGIN) [TARGET_API_MAC_CARBON]: New macros.
+        (mac_dialog) [TARGET_API_MAC_CARBON]: Remove function.
+        (mac_dialog_show) [TARGET_API_MAC_CARBON]: Use create_and_show_dialog.
+
+        * macterm.c (x_free_frame_resources) [USE_CG_DRAWING]: Call
+        mac_prepare_for_quickdraw.
+        (quit_char, make_ctrl_char) [TARGET_API_MAC_CARBON]: Move externs
+        outside #ifdef MAC_OSX.
+        (mac_quit_char_key_p) [TARGET_API_MAC_CARBON]: Move function
+        outside #ifdef MAC_OSX.
+        (mac_check_bundle) [MAC_OSX]: Remove unused function.
+
+        * macterm.h (mac_quit_char_key_p): Move extern outside #ifdef MAC_OSX.
+        (HOURGLASS_WIDTH, HOURGLASS_HEIGHT): Parenthesize definitions.
+
+2007-01-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * alloc.c (BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Use pthread_equal,
+        block/unblock SIGIO.
+
 2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * editfns.c (Fformat): Allow integer-format to work with floats of size
@@ -58,7 +206,7 @@
         * xterm.h (x_display_info): New: net_supported_atoms,
         nr_net_supported_atoms and net_supported_window.
 
-        * xterm.c: New variable last_user_time.
+        * xterm.c (last_user_time): New variable.
         (handle_one_xevent): Set last_user_time from events that have Time.
         Set net_supported_window to 0 when reparented.
         (wm_supports): New function.
@@ -27079,7 +27227,7 @@ See ChangeLog.9 for earlier changes.
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-        2006 Free Software Foundation, Inc.
+        2006, 2007 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/ChangeLog.1 b/src/ChangeLog.1
index 94f1039f71e..4aaa3202dd6 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3522,7 +3522,8 @@
         * minibuf.c: Don't allow entry to minibuffer
         while minibuffer is selected.
 
-    Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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/ChangeLog.2 b/src/ChangeLog.2
index 430cbc0f9da..75dd37940d0 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4771,7 +4771,8 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
+    Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
+        2007  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/ChangeLog.3 b/src/ChangeLog.3
index 73f87793541..bde54ff99f9 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16531,7 +16531,8 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 1993 Free Software Foundation, Inc.
+    Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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/ChangeLog.4 b/src/ChangeLog.4
index b3d40b96b6c..04310b34cad 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6903,7 +6903,8 @@
 
 See ChangeLog.3 for earlier changes.
 
-    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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/ChangeLog.5 b/src/ChangeLog.5
index 5e50066bc78..893a6497996 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7144,7 +7144,8 @@
 
 See ChangeLog.4 for earlier changes.
 
-    Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+    Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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/ChangeLog.6 b/src/ChangeLog.6
index 2da83619eb4..fb29238601a 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5362,7 +5362,8 @@
 
 See ChangeLog.5 for earlier changes.
 
-    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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/ChangeLog.7 b/src/ChangeLog.7
index f1a29903715..c38cb1fc9ca 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11098,7 +11098,8 @@ Fri Sep 20 02:37:37 1996  Marcus Daniels  <marcus@sayre.sysc.pdx.edu>
 
 See ChangeLog.6 for earlier changes.
 
-    Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+    Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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/ChangeLog.8 b/src/ChangeLog.8
index a9465058194..ff6b3b25461 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13991,7 +13991,8 @@ Wed Jun 25 15:22:58 1997  Gerd Moellmann  <gerd@acm.org>
 
 See ChangeLog.7 for earlier changes.
 
-    Copyright (C) 1999 Free Software Foundation, Inc.
+    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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/ChangeLog.9 b/src/ChangeLog.9
index 9ce75696f5a..2a644e13585 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13294,7 +13294,8 @@ See ChangeLog.8 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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 94fe5dee41f..0aa80866a38 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, 2006 Free Software Foundation, Inc.
+#               2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -402,6 +402,11 @@ LIBXT=$(LIBW)
 #endif
 #endif /* not USE_X_TOOLKIT */
 
+#if HAVE_XFT
+#undef LIB_X11_LIB
+#define LIB_X11_LIB @XFT_LIBS@
+#endif /* HAVE_XFT */
+
 #if HAVE_XPM
 #ifndef LIBXPM
 #define LIBXPM -lXpm
diff --git a/src/abbrev.c b/src/abbrev.c
index 45d00728242..7dea6969f35 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/alloc.c b/src/alloc.c
index c49d3b5becc..fe13b84b5a7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,6 +1,6 @@
 /* Storage allocation and gc for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
-      2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+      2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -127,21 +127,21 @@ extern __malloc_size_t __malloc_extra_blocks;
 
 static pthread_mutex_t alloc_mutex;
 
-#define BLOCK_INPUT_ALLOC                       \
-  do                                            \
-    {                                           \
-      if (pthread_self () == main_thread)       \
-        BLOCK_INPUT;                            \
-      pthread_mutex_lock (&alloc_mutex);        \
-    }                                           \
+#define BLOCK_INPUT_ALLOC                               \
+  do                                                    \
+    {                                                   \
+      if (pthread_equal (pthread_self (), main_thread)) \
+        BLOCK_INPUT;                                    \
+      pthread_mutex_lock (&alloc_mutex);                \
+    }                                                   \
   while (0)
-#define UNBLOCK_INPUT_ALLOC                     \
-  do                                            \
-    {                                           \
-      pthread_mutex_unlock (&alloc_mutex);      \
-      if (pthread_self () == main_thread)       \
-        UNBLOCK_INPUT;                          \
-    }                                           \
+#define UNBLOCK_INPUT_ALLOC                             \
+  do                                                    \
+    {                                                   \
+      pthread_mutex_unlock (&alloc_mutex);              \
+      if (pthread_equal (pthread_self (), main_thread)) \
+        UNBLOCK_INPUT;                                  \
+    }                                                   \
   while (0)
 
 #else /* SYSTEM_MALLOC || not HAVE_GTK_AND_PTHREAD */
diff --git a/src/atimer.c b/src/atimer.c
index 8b092270d7b..41dd9e53a02 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -1,6 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/atimer.h b/src/atimer.h
index 84b1383ffdf..8c3b388d012 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -1,6 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/blockinput.h b/src/blockinput.h
index 78dce69fe1f..468f0e0c762 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -49,7 +49,7 @@ Boston, MA 02110-1301, USA.  */
    interrupt_input_pending to a non-zero value.  If that flag is set
    when input becomes unblocked, UNBLOCK_INPUT will send a new SIGIO.  */
 
-extern int interrupt_input_blocked;
+extern volatile int interrupt_input_blocked;
 
 /* Nonzero means an input interrupt has arrived
    during the current critical section.  */
diff --git a/src/buffer.c b/src/buffer.c
index 50203f1d25d..ea4752b4a6e 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, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/buffer.h b/src/buffer.h
index a5f8a6a4070..0652fdb35a8 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/bytecode.c b/src/bytecode.c
index f96535354a4..4cb9e7428fd 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/callint.c b/src/callint.c
index 8f118de5a59..84626031b3c 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/callproc.c b/src/callproc.c
index eb7f8ff6252..8e7ff244697 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/casefiddle.c b/src/casefiddle.c
index cb7c953a3e4..57fcefdde3a 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/casetab.c b/src/casetab.c
index 8c46ab11c60..42c268dd7c6 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/category.c b/src/category.c
index ce238f4d399..809e326cbe9 100644
--- a/src/category.c
+++ b/src/category.c
@@ -1,7 +1,8 @@
 /* GNU Emacs routines to deal with category tables.
-   Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/category.h b/src/category.h
index e27f86f9a91..858a94a6224 100644
--- a/src/category.h
+++ b/src/category.h
@@ -1,6 +1,6 @@
 /* Declarations having to do with Emacs category tables.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/ccl.c b/src/ccl.c
index 49cef07650b..ded74fb6296 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1,8 +1,8 @@
 /* CCL (Code Conversion Language) interpreter.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/ccl.h b/src/ccl.h
index 1cfc8201e54..af3a92d3285 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -1,6 +1,6 @@
 /* Header for CCL (Code Conversion Language) interpreter.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/charset.c b/src/charset.c
index 535022c6797..0d91606da58 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,8 +1,8 @@
 /* Basic multilingual character support.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/charset.h b/src/charset.h
index 645bdafe4b2..2d0116d263e 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,8 +1,8 @@
 /* Header for multibyte character handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/cm.c b/src/cm.c
index 0d49ca40204..d520e740eb3 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 b0d7f2ce84c..a83a5bb090d 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/cmds.c b/src/cmds.c
index b84b9d1d85e..7e07ce1dc6f 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, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/coding.c b/src/coding.c
index f3008af526f..8dc20ef6a3a 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1,8 +1,8 @@
 /* Coding system handler (conversion, detection, and etc).
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/coding.h b/src/coding.h
index c56cd04a226..fc087ccb180 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,8 +1,8 @@
 /* Header for coding system handler.
-   Copyright (C) 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/commands.h b/src/commands.h
index 5c7cad37407..2d0db0ec13c 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/composite.c b/src/composite.c
index 8e5fce2da96..3e0606e9007 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1,7 +1,7 @@
 /* Composite sequence support.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+                 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/composite.h b/src/composite.h
index e19fcd99e73..8ff6416990f 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,7 +1,7 @@
 /* Header for composite sequence handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+                 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/config.in b/src/config.in
index f0ebbc76218..71b4af0c839 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,7 +1,7 @@
 /* src/config.in.  Generated from configure.in by autoheader.  */
 
 /* GNU Emacs site configuration template file.
-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -713,6 +713,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you're using XFree386. */
 #undef HAVE_XFREE386
 
+/* Define to 1 if you have the Xft library. */
+#undef HAVE_XFT
+
 /* Define to 1 if XIM is available */
 #undef HAVE_XIM
 
diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s
index b05faf57b8e..9a359a44955 100644
--- a/src/cxux-crt0.s
+++ b/src/cxux-crt0.s
@@ -1,7 +1,7 @@
 /*
  * External symbol setup file for GNU Emacs on CX/UX
  * Copyright (C) 1990, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ *               2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GNU Emacs.
  *
diff --git a/src/data.c b/src/data.c
index dc9095c033c..2f682450a16 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, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dired.c b/src/dired.c
index 7b8f978b20c..c542f8019db 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -930,6 +930,7 @@ Elements of the attribute list are:
   char modes[10];
   Lisp_Object handler;
   struct gcpro gcpro1;
+  EMACS_INT uid, gid, ino;
 
   filename = Fexpand_file_name (filename, Qnil);
 
@@ -964,20 +965,26 @@ Elements of the attribute list are:
 #endif
     }
   values[1] = make_number (s.st_nlink);
+  /* When make_fixnum_or_float is called below with types that are
+     shorter than an int (e.g., `short'), GCC whines about comparison
+     being always false due to limited range of data type.  Fix by
+     copying s.st_uid and s.st_gid into int variables.  */
+  uid = s.st_uid;
+  gid = s.st_gid;
   if (NILP (id_format) || EQ (id_format, Qinteger))
     {
-      values[2] = make_fixnum_or_float (s.st_uid);
-      values[3] = make_fixnum_or_float (s.st_gid);
+      values[2] = make_fixnum_or_float (uid);
+      values[3] = make_fixnum_or_float (gid);
     }
   else
     {
       BLOCK_INPUT;
-      pw = (struct passwd *) getpwuid (s.st_uid);
+      pw = (struct passwd *) getpwuid (uid);
       values[2] = (pw ? build_string (pw->pw_name)
-                  : make_fixnum_or_float (s.st_uid));
-      gr = (struct group *) getgrgid (s.st_gid);
+                  : make_fixnum_or_float (uid));
+      gr = (struct group *) getgrgid (gid);
       values[3] = (gr ? build_string (gr->gr_name)
-                  : make_fixnum_or_float (s.st_gid));
+                  : make_fixnum_or_float (gid));
       UNBLOCK_INPUT;
     }
   values[4] = make_time (s.st_atime);
@@ -999,20 +1006,22 @@ Elements of the attribute list are:
   if (! NILP (dirname))
     encoded = ENCODE_FILE (dirname);
   if (! NILP (dirname) && stat (SDATA (encoded), &sdir) == 0)
-    values[9] = (sdir.st_gid != s.st_gid) ? Qt : Qnil;
+    values[9] = (sdir.st_gid != gid) ? Qt : Qnil;
   else                                  /* if we can't tell, assume worst */
     values[9] = Qt;
 #else                                   /* file gid will be egid */
-  values[9] = (s.st_gid != getegid ()) ? Qt : Qnil;
+  values[9] = (gid != getegid ()) ? Qt : Qnil;
 #endif  /* BSD4_2 (or BSD4_3) */
-  if (FIXNUM_OVERFLOW_P (s.st_ino))
+  /* Shut up GCC warnings in FIXNUM_OVERFLOW_P below.  */
+  ino = s.st_ino;
+  if (FIXNUM_OVERFLOW_P (ino))
     /* To allow inode numbers larger than VALBITS, separate the bottom
        16 bits.  */
-    values[10] = Fcons (make_number (s.st_ino >> 16),
-                        make_number (s.st_ino & 0xffff));
+    values[10] = Fcons (make_number (ino >> 16),
+                        make_number (ino & 0xffff));
   else
     /* But keep the most common cases as integers.  */
-    values[10] = make_number (s.st_ino);
+    values[10] = make_number (ino);
 
   /* Likewise for device.  */
   if (FIXNUM_OVERFLOW_P (s.st_dev))
diff --git a/src/dispextern.h b/src/dispextern.h
index 1198838c17d..4c3bd56e121 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, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 5ace8ac2985..c2a37f8248e 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, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4394,12 +4394,12 @@ update_text_area (w, vpos)
       || desired_row->phys_height != current_row->phys_height
       || desired_row->visible_height != current_row->visible_height
       || current_row->overlapped_p
-#if 0
-      /* This causes excessive flickering when mouse is moved across
-         the mode line.  Luckily everything seems to work just fine
-         without doing this.  KFS 2006-09-17.  */
-      || current_row->mouse_face_p
-#endif
+      /* This next line is necessary for correctly redrawing
+         mouse-face areas after scrolling and other operations.
+         However, it causes excessive flickering when mouse is moved
+         across the mode line.  Luckily, turning it off for the mode
+         line doesn't seem to hurt anything. -- cyd.  */
+      || (current_row->mouse_face_p && !current_row->mode_line_p)
       || current_row->x != desired_row->x)
     {
       rif->cursor_to (vpos, 0, desired_row->y, desired_row->x);
diff --git a/src/disptab.h b/src/disptab.h
index 80936fb1830..e20f3e27631 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -1,6 +1,6 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/doc.c b/src/doc.c
index 93f372606a4..be52f8aa07e 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/doprnt.c b/src/doprnt.c
index 63c0261e6ae..326fb5743e2 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -1,8 +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,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dosfns.c b/src/dosfns.c
index 92b90e530da..e57a6a197be 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dosfns.h b/src/dosfns.h
index 4f1cfd83d22..622e7cb5335 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -2,8 +2,8 @@
    Coded by Manabu Higashida, 1991.
    Modified by Morten Welinder, 1993-1994.
 
-   Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/ecrt0.c b/src/ecrt0.c
index a9b993d360e..7f94f07dc00 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/editfns.c b/src/editfns.c
index ab29a07b693..6ef2efe313e 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1314,7 +1314,10 @@ DEFUN ("user-uid", Fuser_uid, Suser_uid, 0, 0, 0,
 Value is an integer or float, depending on the value.  */)
      ()
 {
-  return make_fixnum_or_float (geteuid ());
+  /* Assignment to EMACS_INT stops GCC whining about limited range of
+     data type.  */
+  EMACS_INT euid = geteuid ();
+  return make_fixnum_or_float (euid);
 }
 
 DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0,
@@ -1322,7 +1325,10 @@ DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0,
 Value is an integer or float, depending on the value.  */)
      ()
 {
-  return make_fixnum_or_float (getuid ());
+  /* Assignment to EMACS_INT stops GCC whining about limited range of
+     data type.  */
+  EMACS_INT uid = getuid ();
+  return make_fixnum_or_float (uid);
 }
 
 DEFUN ("user-full-name", Fuser_full_name, Suser_full_name, 0, 1, 0,
@@ -1450,9 +1456,9 @@ most significant 16 bits of the seconds, while the second has the
 least significant 16 bits.  The third integer gives the microsecond
 count.
 
-On systems that can't determine the run time, get-internal-run-time
-does the same thing as current-time.  The microsecond count is zero on
-systems that do not provide resolution finer than a second.  */)
+On systems that can't determine the run time, `get-internal-run-time'
+does the same thing as `current-time'.  The microsecond count is zero
+on systems that do not provide resolution finer than a second.  */)
      ()
 {
 #ifdef HAVE_GETRUSAGE
@@ -1715,7 +1721,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
 DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 1, 0,
        doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST ZONE).
 The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED),
-as from `current-time' and `file-attributes', or `nil' to use the
+as from `current-time' and `file-attributes', or nil to use the
 current time.  The obsolete form (HIGH . LOW) is also still accepted.
 The list has the following nine members: SEC is an integer between 0
 and 60; SEC is 60 for a leap second, which only some operating systems
@@ -2279,8 +2285,7 @@ usage: (insert-before-markers-and-inherit &rest ARGS)  */)
 }
 
 DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0,
-       doc: /* Insert COUNT (second arg) copies of CHARACTER (first arg).
-Both arguments are required.
+       doc: /* Insert COUNT copies of CHARACTER.
 Point, and before-insertion markers, are relocated as in the function `insert'.
 The optional third arg INHERIT, if non-nil, says to inherit text properties
 from adjoining text, if those properties are sticky.  */)
@@ -3169,7 +3174,7 @@ save_restriction_restore (data)
 DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0,
        doc: /* Execute BODY, saving and restoring current buffer's restrictions.
 The buffer's restrictions make parts of the beginning and end invisible.
-(They are set up with `narrow-to-region' and eliminated with `widen'.)
+\(They are set up with `narrow-to-region' and eliminated with `widen'.)
 This special form, `save-restriction', saves the current buffer's restrictions
 when it is entered, and restores them when it is exited.
 So any `narrow-to-region' within BODY lasts only until the end of the form.
diff --git a/src/emacs.c b/src/emacs.c
index d068ee767bf..d49d81e70bb 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,6 +1,6 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -867,7 +867,7 @@ main (argc, argv
       else
         {
           printf ("GNU Emacs %s\n", SDATA (tem));
-          printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
+          printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n");
           printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
           printf ("You may redistribute copies of Emacs\n");
           printf ("under the terms of the GNU General Public License.\n");
diff --git a/src/epaths.in b/src/epaths.in
index d494d85139c..34d97897c7d 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -52,7 +52,7 @@ Boston, MA 02110-1301, USA.  */
 /* Where the configuration process believes the info tree lives.  The
    lisp variable configure-info-directory gets its value from this
    macro, and is then used to set the Info-default-directory-list.  */
-#define PATH_INFO "/usr/local/info"
+#define PATH_INFO "/usr/local/share/info"
 
 /* Where Emacs should store game score files.  */
 #define PATH_GAME "/usr/local/var/games/emacs"
diff --git a/src/eval.c b/src/eval.c
index c587142762e..b1bd3daef7a 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/fileio.c b/src/fileio.c
index f41699bcc46..074a7a0527c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,7 +1,7 @@
 /* File IO for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/filelock.c b/src/filelock.c
index 6e8e6da9fbd..689a80a4209 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/filemode.c b/src/filemode.c
index 835a8a3778e..b15f65c1647 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1990, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 06e7022d89a..8093f03efc3 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -1,6 +1,6 @@
 /* Mark beginning of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1997, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/floatfns.c b/src/floatfns.c
index dd879de7eb8..e0ed9b625cd 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/fns.c b/src/fns.c
index 709b58882ef..c75c4d68cf3 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4671,6 +4671,7 @@ maybe_resize_hash_table (h)
     {
       int old_size = HASH_TABLE_SIZE (h);
       int i, new_size, index_size;
+      EMACS_INT nsize;
 
       if (INTEGERP (h->rehash_size))
         new_size = old_size + XFASTINT (h->rehash_size);
@@ -4680,7 +4681,10 @@ maybe_resize_hash_table (h)
       index_size = next_almost_prime ((int)
                                       (new_size
                                        / XFLOATINT (h->rehash_threshold)));
-      if (max (index_size, 2 * new_size) > MOST_POSITIVE_FIXNUM)
+      /* Assignment to EMACS_INT stops GCC whining about limited range
+         of data type.  */
+      nsize = max (index_size, 2 * new_size);
+      if (nsize > MOST_POSITIVE_FIXNUM)
         error ("Hash table too large to resize");
 
       h->key_and_value = larger_vector (h->key_and_value, 2 * new_size, Qnil);
diff --git a/src/fontset.c b/src/fontset.c
index 66a31e9acf0..7d227d8f43f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,7 +1,8 @@
 /* Fontset handler.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/fontset.h b/src/fontset.h
index a08f7b74bd0..a2bac100396 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,8 +1,8 @@
 /* Header for fontset handler.
-   Copyright (C) 1998, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/frame.c b/src/frame.c
index b6f361bcbfe..7d5bdcb1cb6 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, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/frame.h b/src/frame.h
index 9f22d1c08ab..47f7483994e 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/fringe.c b/src/fringe.c
index dd885beb1b6..2fb88ce01e8 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, 2006 Free Software Foundation, Inc.
+                 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 3f616b47116..f40149a8c47 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1,6 +1,7 @@
 /* Get the system load averages.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995,
-                 1997, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 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 f38409da452..c4551677d16 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 646fbbc4e4c..3f32617fc64 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 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 d57a0b56c0c..7953ce30740 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3937,6 +3937,11 @@ xg_initialize ()
 {
   GtkBindingSet *binding_set;
 
+#if HAVE_XFT
+  /* Work around a bug with corrupted data if libXft gets unloaded.  This way
+     we keep it permanently linked in.  */
+  XftInit (0);
+#endif
   xg_ignore_gtk_scrollbar = 0;
   xg_detached_menus = 0;
   xg_menu_cb_list.prev = xg_menu_cb_list.next =
diff --git a/src/gtkutil.h b/src/gtkutil.h
index c3957223a18..f87583ea1c2 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -1,5 +1,5 @@
 /* Definitions and headers for GTK widgets.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/image.c b/src/image.c
index b4ee3104543..49d25d819bc 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, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/indent.c b/src/indent.c
index af556bc38e3..bb77de1be9b 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/indent.h b/src/indent.h
index ddfd16a16de..b9c39869e60 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/insdel.c b/src/insdel.c
index bd6e30d9449..08043147cdf 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/intervals.c b/src/intervals.c
index 20c4c191a93..861cb24c598 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/intervals.h b/src/intervals.h
index 052b55d5a3c..f89b748f2ff 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index c2603427004..82e97441667 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -89,7 +89,7 @@ extern int errno;
 /* Variables for blockinput.h: */
 
 /* Non-zero if interrupt input is blocked right now.  */
-int interrupt_input_blocked;
+volatile int interrupt_input_blocked;
 
 /* Nonzero means an input interrupt has arrived
    during the current critical section.  */
@@ -9493,7 +9493,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                     {
                       pos = POSN_BUFFER_POSN (start);
                       if (INTEGERP (pos)
-                          && XINT (pos) >= BEG && XINT (pos) <= Z)
+                          && XINT (pos) >= BEGV
+                          && XINT (pos) <= ZV)
                         {
                           map_here = get_local_map (XINT (pos),
                                                     current_buffer, Qlocal_map);
@@ -10507,7 +10508,9 @@ DEFUN ("this-command-keys", Fthis_command_keys, Sthis_command_keys, 0, 0, 0,
        doc: /* Return the key sequence that invoked this command.
 However, if the command has called `read-key-sequence', it returns
 the last key sequence that has been read.
-The value is a string or a vector.  */)
+The value is a string or a vector.
+
+See also `this-command-keys-vector'.  */)
      ()
 {
   return make_event_array (this_command_key_count,
@@ -10517,7 +10520,9 @@ The value is a string or a vector.  */)
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector, Sthis_command_keys_vector, 0, 0, 0,
        doc: /* Return the key sequence that invoked this command, as a vector.
 However, if the command has called `read-key-sequence', it returns
-the last key sequence that has been read.  */)
+the last key sequence that has been read.
+
+See also `this-command-keys'.  */)
      ()
 {
   return Fvector (this_command_key_count,
diff --git a/src/keyboard.h b/src/keyboard.h
index 749a8aefb28..0879bacc156 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/keymap.c b/src/keymap.c
index 634a52b3834..c85c37aae12 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3448,9 +3448,13 @@ describe_map (map, prefix, elt_describer, partial, shadow,
               tem = shadow_lookup (shadow, kludge, Qt);
               if (!NILP (tem))
                 {
+                  /* If both bindings are keymaps, this key is a prefix key,
+                     so don't say it is shadowed.  */
+                  if (KEYMAPP (definition) && KEYMAPP (tem))
+                    ;
                   /* Avoid generating duplicate entries if the
-                     shadowed binding has the same definition. */
-                  if (mention_shadow && !EQ (tem, definition))
+                     shadowed binding has the same definition.  */
+                  else if (mention_shadow && !EQ (tem, definition))
                     this_shadowed = 1;
                   else
                     continue;
diff --git a/src/keymap.h b/src/keymap.h
index 271a2e64284..9614f578f37 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -1,6 +1,6 @@
 /* Functions to manipulate keymaps.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/lastfile.c b/src/lastfile.c
index 7c5e067dd02..7a7888f4683 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -1,6 +1,6 @@
 /* Mark end of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/lisp.h b/src/lisp.h
index f5d936089cf..7a03836021b 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, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/lread.c b/src/lread.c
index 9142e0c6dcd..0014c31c45d 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/7300.h b/src/m/7300.h
index a8751efa52a..1022e077046 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -1,6 +1,6 @@
 /* machine description file for AT&T UNIX PC model 7300
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 326fb7760ae..dee60071e12 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -1,6 +1,6 @@
 /* Machine description file for Acorn RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 d56624a1eac..e81fe48b9e7 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -1,6 +1,6 @@
 /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/alliant.h b/src/m/alliant.h
index 49459c0b7f7..5ddab96012f 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 47003400846..cf629c20291 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/altos.h b/src/m/altos.h
index 16e7fb7ce06..1a7c6d4f95a 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index e418e3a43bf..c5cae1fc560 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 36e62ef6166..0dcf5524645 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/apollo.h b/src/m/apollo.h
index d9b3cffdb6d..0e6e53327bc 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/arm.h b/src/m/arm.h
index 0a49f0cbd4b..18675f2805c 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -1,6 +1,6 @@
 /* Machine description file for ARM-based non-RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 049593ebcf4..33411ff005c 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -1,6 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 50355b25bd6..87b7d963f5a 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1991, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 10d38e14c6c..0eba349b7db 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/clipper.h b/src/m/clipper.h
index 0dfa13382b3..6851761d53e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index f8df583657a..09e3365bee9 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -1,6 +1,6 @@
 /* machine description file for convergent S series.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/convex.h b/src/m/convex.h
index fa87d89e3d3..2904b5942f4 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index a64f4761c25..75aca4b0e64 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 86e416e887d..7017e38284e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 2a90ff46284..de0b93b21ac 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/dual.h b/src/m/dual.h
index d02ac5bc38e..63829b75d2e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index 0cb0c5513bf..c264d57338b 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 9db133ba682..528ce95d685 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 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 272a06cf305..a750c9f8f39 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -1,6 +1,6 @@
 /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1)
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/gould.h b/src/m/gould.h
index 3b5f1494e78..0b422f18fe2 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -6,7 +6,7 @@
 * official releases of 2.1
 
    Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/hp800.h b/src/m/hp800.h
deleted file mode 100644
index 1630a0bc883..00000000000
--- a/src/m/hp800.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* machine description file for hp9000 series 800 machines.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
-/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define WORDS_BIG_ENDIAN
-
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-
-#undef WORD_MACHINE
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#       define hp9000s800
-#endif
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-
-   If you use NO_UNION_TYPE, this flag does not matter.  */
-
-#define EXPLICIT_SIGN_EXTEND
-
-/* The standard definitions of these macros would work ok,
-   but these are faster because the constants are short. */
-
-
-#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
-
-#define XSET(var, type, ptr) \
-   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-/* Common definitions for HPUX and GNU/Linux.  */
-
-#if defined (__hpux) || defined (GNU_LINUX)
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#     define hp9000s800
-#endif
-
-/* Define CANNOT_DUMP on machines where unexec does not work.
-   Then the function dump-emacs will not be defined
-   and temacs will do (load "loadup") automatically unless told otherwise.  */
-
-#undef CANNOT_DUMP
-
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
-#endif /* __hpux or GNU_LINUX */
-
-/* Stuff for just GNU/Linux.  */
-
-#ifdef GNU_LINUX
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-#endif /* GNU_LINUX */
-
-/* Stuff for just HPUX.  */
-
-#ifdef __hpux
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-#define VIRT_ADDR_VARIES
-
-/* the data segment on this machine always starts at address 0x40000000. */
-
-#define DATA_SEG_BITS 0x40000000
-
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#define UNEXEC unexhp9k800.o
-
-#define LIBS_MACHINE
-#define LIBS_DEBUG
-
-/* Include the file bsdtty.h, since this machine has job control.  */
-#define NEED_BSDTTY
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-
-#if 0   /* Supposedly no longer true.  */
-/* In hpux, for unknown reasons, S_IFLNK is defined even though
-   symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.  */
-
-#undef S_IFLNK
-#endif
-
-/* On USG systems these have different names. */
-
-#define index strchr
-#define rindex strrchr
-
-#endif /* __hpux */
-
-/* Systems with GCC don't need to lose. */
-#ifdef __NetBSD__
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-#  define HAVE_ALLOCA
-# endif /* __GNUC__ */
-#endif /* __NetBSD__ */
-
-/* arch-tag: 809436e6-1645-4b92-b40d-2de5d6e7227c
-   (do not change this comment) */
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 9760b9bd2ed..c02a68d31cc 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -1,6 +1,6 @@
 /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/i860.h b/src/m/i860.h
index d74a01a889c..6af68cc2ae7 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 560cd30f599..7e88aeaedc8 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,6 +1,6 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 1a9ed6efe11..09460092b3e 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 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 ea895cd4fd8..c8449baef41 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -1,6 +1,6 @@
 /* machine description file for ibm ps/2 aix386.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 10b43bf8246..6729282953e 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,6 +1,6 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 43e11b36428..ccee40a46a9 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index e78d182940c..2cf372a278d 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -1,6 +1,6 @@
 /* RTPC machine dependent defines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index d60b33fdd04..e038e2e1b52 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 716dd44c727..f8b21bc3df4 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,5 +1,5 @@
 /* machine description file for IBM S390 in 64-bit mode
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 0d2aacf8d19..44ba3245b2e 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,6 +1,6 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index bc8d1242710..4304871ca23 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,6 +1,6 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/irist.h b/src/m/irist.h
index a366b521a9a..4ae3681bd92 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 5b6c3cd0214..ed96605b5a1 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 31307ffa499..1071847eda9 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 25005888c77..eba0a401a18 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index df0d9a1aa1a..777ff797727 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -1,6 +1,6 @@
 /* machine description file for Masscomp 5000 series running RTU, ucb universe.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/mega68.h b/src/m/mega68.h
index 7db67fa0cca..54340bdb0be 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -1,6 +1,6 @@
 /* machine description file for Megatest 68000's.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 92e358837c4..b0d6faca500 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -1,6 +1,6 @@
 /* machine description file for Whitechapel Computer Works MG1 (ns16000 based).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 27274c8b527..376f8805788 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 9ae74178143..ee8e63030c7 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/news.h b/src/m/news.h
index 5ac2cd6b6dc..13a718a8612 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1989, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/next.h b/src/m/next.h
index b519e41920d..2a0f7243772 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -1,6 +1,6 @@
 /* Configuration file for the NeXT machine.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index ad2d8dd1340..e5cf1a61b58 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -1,8 +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,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index 1c0bc51c896..ba695700d77 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -1,7 +1,7 @@
 /* machine description for Harris NightHawk 88k based machines
    (includes nh4000 and nh5000 machines).
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 5e9793a44b8..707cb21abb7 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -1,6 +1,6 @@
 /* machine description file for ns16000.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 33e48d297bc..fe1fd153b70 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nu.h b/src/m/nu.h
index ec051150bdf..01fadeba18a 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -1,6 +1,6 @@
 /* machine description file for TI Nu machines using system V.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/orion.h b/src/m/orion.h
index 3db485dd3f1..472b7b4c8eb 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -1,6 +1,6 @@
 /* machine description file for HLH Orion.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/orion105.h b/src/m/orion105.h
index 66f87748099..586ddf2ea35 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -1,6 +1,6 @@
 /* machine description file for HLH Orion 1/05 (Clipper).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 0b1511fd8e7..3c13aa77872 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/plexus.h b/src/m/plexus.h
index 8b3e9be7849..606caeb20f4 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -1,6 +1,6 @@
 /* machine description file for the Plexus running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/powermac.h b/src/m/powermac.h
index 232e424da35..419edb21b9f 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index b4681db06bd..fb70cbfcb4f 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -1,6 +1,6 @@
 /* machine description file for PowerPC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 2dbd713f881..9a07ff09f1d 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 dbb0944a330..03a0bff3e12 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sequent.h b/src/m/sequent.h
index e970275901c..d0051642826 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sh3el.h b/src/m/sh3el.h
index 0854ecd1b25..9c510979bdc 100644
--- a/src/m/sh3el.h
+++ b/src/m/sh3el.h
@@ -1,5 +1,5 @@
 /* machine description file for sh3el
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sparc.h b/src/m/sparc.h
index c9ef035653b..3efb4c05553 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,6 +1,6 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 52edc570f92..db6c9d3a91e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
deleted file mode 100644
index 14a90c666f4..00000000000
--- a/src/m/sr2k.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* machine description file for Hitachi SR2001/SR2201 machines.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
-/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define WORDS_BIG_ENDIAN
-
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-
-#undef WORD_MACHINE
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#       define hp9000s800
-#endif
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-
-   If you use NO_UNION_TYPE, this flag does not matter.  */
-
-#define EXPLICIT_SIGN_EXTEND
-
-/* The standard definitions of these macros would work ok,
-   but these are faster because the constants are short. */
-
-
-#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
-
-#define XSET(var, type, ptr) \
-   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-/* #ifdef __hpux */
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-
-#ifndef hp9000s800
-#     define hp9000s800
-#endif
-
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
-
-
-/* Define CANNOT_DUMP on machines where unexec does not work.
-   Then the function dump-emacs will not be defined
-   and temacs will do (load "loadup") automatically unless told otherwise.  */
-
-#undef CANNOT_DUMP
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-#define VIRT_ADDR_VARIES
-
-/* the data segment on this machine always starts at address 0x40000000. */
-
-#define DATA_SEG_BITS 0x40000000
-
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#define UNEXEC unexhp9k800.o
-
-#define LIBS_MACHINE
-#define LIBS_DEBUG
-
-/* Include the file bsdtty.h, since this machine has job control.  */
-/* #define NEED_BSDTTY */
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-
-#if 0   /* Supposedly no longer true.  */
-/* In hpux, for unknown reasons, S_IFLNK is defined even though
-   symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.  */
-
-#undef S_IFLNK
-#endif
-
-/* On USG systems these have different names. */
-
-#define index strchr
-#define rindex strrchr
-
-/* #endif */
-
-/* arch-tag: 4ced5b51-ffe6-4be1-9954-eb40657023a5
-   (do not change this comment) */
diff --git a/src/m/stride.h b/src/m/stride.h
index 6f05b17d96e..8acc84e3cbe 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 5ded70a9e47..526056dd80f 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 1afa4a2fa63..cee54da79b7 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -1,8 +1,8 @@
 /* machine description file for Sun 68000's OPERATING SYSTEM version 2.
   Note that "sun2.h" refers to the operating system version, not the
   CPU model number.  See the MACHINES file for details.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun386.h b/src/m/sun386.h
index 435c1ded6d2..21a07a69423 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -2,8 +2,8 @@
    "sun2.h", but since that file is heavily cpu-specific, it was easier
    not to include it.
 
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index 91209d0eb67..39dde99f13c 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index fce223da826..357bbe80982 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -1,6 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 07ec23c7bb6..c28018a149d 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -1,6 +1,6 @@
 /* machine description file for tahoe.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/targon31.h b/src/m/targon31.h
index 7100e0e8705..34e3ae40c9e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 3ff3ca4a6a0..30e40a0e09f 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -1,6 +1,6 @@
 /* machine description file for tek4300.
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 24c10330363..3b858310af3 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -1,8 +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,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/template.h b/src/m/template.h
index 2b39964018a..79d2d40ab70 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 06ed7efe5d7..cdb6884d5fc 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -1,6 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index 8f5c60cd7c8..19e7d3ba7ea 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -1,6 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.3.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ustation.h b/src/m/ustation.h
index 0a70df92233..b662cca208e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/vax.h b/src/m/vax.h
index 9332b8f494d..fae30d37f73 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/wicat.h b/src/m/wicat.h
index 24bb2acd210..6ab0a498104 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -1,6 +1,6 @@
 /* machine description file for WICAT machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 4351f14144f..223958375ca 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/xps100.h b/src/m/xps100.h
index a9ac9bc5e36..89300211eec 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -1,8 +1,8 @@
 /* xps100.h for the Honeywell XPS100 running UNIX System V.2
    Mark J. Hewitt (mjh@uk.co.kernel)
 
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/mac.c b/src/mac.c
index d834bfb8de4..5084a02b27d 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macfns.c b/src/macfns.c
index c74fd1089f0..c43a43dae62 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macgui.h b/src/macgui.h
index 7eed001a4db..1348fe479cb 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macmenu.c b/src/macmenu.c
index a70a80d32ed..3ea09412650 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -77,10 +77,11 @@ static const int min_menu_id[] = {0, 1, 234, 235, 236, 256, 16384, 32768};
 
 #define DIALOG_WINDOW_RESOURCE 130
 
+#if TARGET_API_MAC_CARBON
 #define HAVE_DIALOGS 1
+#endif
 
 #undef HAVE_MULTILINGUAL_MENU
-#undef HAVE_DIALOGS /* TODO: Implement native dialogs.  */
 
 /******************************************************************/
 /* Definitions copied from lwlib.h */
@@ -2319,8 +2320,390 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 
 
 #ifdef HAVE_DIALOGS
-/* Construct native Mac OS menubar based on widget_value tree.  */
+/* Construct native Mac OS dialog based on widget_value tree.  */
+
+#if TARGET_API_MAC_CARBON
+
+static pascal OSStatus
+mac_handle_dialog_event (next_handler, event, data)
+     EventHandlerCallRef next_handler;
+     EventRef event;
+     void *data;
+{
+  OSStatus err;
+  WindowRef window = (WindowRef) data;
+
+  switch (GetEventClass (event))
+    {
+    case kEventClassCommand:
+      {
+        HICommand command;
+
+        err = GetEventParameter (event, kEventParamDirectObject,
+                                 typeHICommand, NULL, sizeof (HICommand),
+                                 NULL, &command);
+        if (err == noErr)
+          if ((command.commandID & ~0xffff) == 'Bt\0\0')
+            {
+              SetWRefCon (window, command.commandID);
+              err = QuitAppModalLoopForWindow (window);
+
+              return err == noErr ? noErr : eventNotHandledErr;
+            }
+
+        return CallNextEventHandler (next_handler, event);
+      }
+      break;
+
+    case kEventClassKeyboard:
+      {
+        OSStatus result;
+        char char_code;
+
+        result = CallNextEventHandler (next_handler, event);
+        if (result == noErr)
+          return noErr;
+
+        err = GetEventParameter (event, kEventParamKeyMacCharCodes,
+                                 typeChar, NULL, sizeof (char),
+                                 NULL, &char_code);
+        if (err == noErr)
+          switch (char_code)
+            {
+            case kEscapeCharCode:
+              err = QuitAppModalLoopForWindow (window);
+              break;
+
+            default:
+              {
+                UInt32 modifiers, key_code;
+
+                err = GetEventParameter (event, kEventParamKeyModifiers,
+                                         typeUInt32, NULL, sizeof (UInt32),
+                                         NULL, &modifiers);
+                if (err == noErr)
+                  err = GetEventParameter (event, kEventParamKeyCode,
+                                           typeUInt32, NULL, sizeof (UInt32),
+                                           NULL, &key_code);
+                if (err == noErr)
+                  if (mac_quit_char_key_p (modifiers, key_code))
+                    err = QuitAppModalLoopForWindow (window);
+                  else
+                    err = eventNotHandledErr;
+              }
+              break;
+            }
+
+        return err == noErr ? noErr : result;
+      }
+      break;
+
+    default:
+      abort ();
+    }
+}
+
+static OSStatus
+install_dialog_event_handler (window)
+     WindowRef window;
+{
+  static const EventTypeSpec specs[] =
+    {{kEventClassCommand, kEventCommandProcess},
+     {kEventClassKeyboard, kEventRawKeyDown}};
+  static EventHandlerUPP handle_dialog_eventUPP = NULL;
+
+  if (handle_dialog_eventUPP == NULL)
+    handle_dialog_eventUPP = NewEventHandlerUPP (mac_handle_dialog_event);
+  return InstallWindowEventHandler (window, handle_dialog_eventUPP,
+                                    GetEventTypeCount (specs), specs,
+                                    window, NULL);
+}
+
+#define DIALOG_LEFT_MARGIN (112)
+#define DIALOG_TOP_MARGIN (24)
+#define DIALOG_RIGHT_MARGIN (24)
+#define DIALOG_BOTTOM_MARGIN (20)
+#define DIALOG_MIN_INNER_WIDTH (338)
+#define DIALOG_MAX_INNER_WIDTH (564)
+#define DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE (12)
+#define DIALOG_BUTTON_BUTTON_VERTICAL_SPACE (12)
+#define DIALOG_BUTTON_MIN_WIDTH (68)
+#define DIALOG_TEXT_MIN_HEIGHT (50)
+#define DIALOG_TEXT_BUTTONS_VERTICAL_SPACE (10)
+#define DIALOG_ICON_WIDTH (64)
+#define DIALOG_ICON_HEIGHT (64)
+#define DIALOG_ICON_LEFT_MARGIN (24)
+#define DIALOG_ICON_TOP_MARGIN (15)
+
+static int
+create_and_show_dialog (f, first_wv)
+     FRAME_PTR f;
+     widget_value *first_wv;
+{
+  OSStatus err;
+  char *dialog_name, *message;
+  int nb_buttons, first_group_count, i, result = 0;
+  widget_value *wv;
+  short buttons_height, text_height, inner_width, inner_height;
+  Rect empty_rect, *rects;
+  WindowRef window = NULL;
+  ControlRef *buttons, default_button = NULL, text;
+
+  dialog_name = first_wv->name;
+  nb_buttons = dialog_name[1] - '0';
+  first_group_count = nb_buttons - (dialog_name[4] - '0');
+
+  wv = first_wv->contents;
+  message = wv->value;
+
+  wv = wv->next;
+  SetRect (&empty_rect, 0, 0, 0, 0);
+
+  /* Create dialog window.  */
+  err = CreateNewWindow (kMovableModalWindowClass,
+                         kWindowStandardHandlerAttribute,
+                         &empty_rect, &window);
+  if (err == noErr)
+    err = SetThemeWindowBackground (window, kThemeBrushMovableModalBackground,
+                                    true);
+  if (err == noErr)
+    err = SetWindowTitleWithCFString (window, (dialog_name[0] == 'Q'
+                                               ? CFSTR ("Question")
+                                               : CFSTR ("Information")));
+
+  /* Create button controls and measure their optimal bounds.  */
+  if (err == noErr)
+    {
+      buttons = alloca (sizeof (ControlRef) * nb_buttons);
+      rects = alloca (sizeof (Rect) * nb_buttons);
+      for (i = 0; i < nb_buttons; i++)
+        {
+          CFStringRef label = cfstring_create_with_utf8_cstring (wv->value);
+
+          if (label == NULL)
+            err = memFullErr;
+          else
+            {
+              err = CreatePushButtonControl (window, &empty_rect,
+                                             label, &buttons[i]);
+              CFRelease (label);
+            }
+          if (err == noErr)
+            {
+              if (!wv->enabled)
+                {
+#ifdef MAC_OSX
+                  err = DisableControl (buttons[i]);
+#else
+                  err = DeactivateControl (buttons[i]);
+#endif
+                }
+              else if (default_button == NULL)
+                default_button = buttons[i];
+            }
+          if (err == noErr)
+            {
+              SInt16 unused;
+
+              rects[i] = empty_rect;
+              err = GetBestControlRect (buttons[i], &rects[i], &unused);
+            }
+          if (err == noErr)
+            {
+              OffsetRect (&rects[i], -rects[i].left, -rects[i].top);
+              if (rects[i].right < DIALOG_BUTTON_MIN_WIDTH)
+                rects[i].right = DIALOG_BUTTON_MIN_WIDTH;
+              else if (rects[i].right > DIALOG_MAX_INNER_WIDTH)
+                rects[i].right = DIALOG_MAX_INNER_WIDTH;
+
+              err = SetControlCommandID (buttons[i],
+                                         'Bt\0\0' + (int) wv->call_data);
+            }
+          if (err != noErr)
+            break;
+          wv = wv->next;
+        }
+    }
+
+  /* Layout buttons.  rects[i] is set relative to the bottom-right
+     corner of the inner box.  */
+  if (err == noErr)
+    {
+      short bottom, right, max_height, left_align_shift;
+
+      inner_width = DIALOG_MIN_INNER_WIDTH;
+      bottom = right = max_height = 0;
+      for (i = 0; i < nb_buttons; i++)
+        {
+          if (right - rects[i].right < - inner_width)
+            {
+              if (i != first_group_count
+                  && right - rects[i].right >= - DIALOG_MAX_INNER_WIDTH)
+                inner_width = - (right - rects[i].right);
+              else
+                {
+                  bottom -= max_height + DIALOG_BUTTON_BUTTON_VERTICAL_SPACE;
+                  right = max_height = 0;
+                }
+            }
+          if (max_height < rects[i].bottom)
+            max_height = rects[i].bottom;
+          OffsetRect (&rects[i], right - rects[i].right,
+                      bottom - rects[i].bottom);
+          right = rects[i].left - DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE;
+          if (i == first_group_count - 1)
+            right -= DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE;
+        }
+      buttons_height = - (bottom - max_height);
+
+      left_align_shift = - (inner_width + rects[nb_buttons - 1].left);
+      for (i = nb_buttons - 1; i >= first_group_count; i--)
+        {
+          if (bottom != rects[i].bottom)
+            {
+              left_align_shift = - (inner_width + rects[i].left);
+              bottom = rects[i].bottom;
+            }
+          OffsetRect (&rects[i], left_align_shift, 0);
+        }
+    }
+
+  /* Create a static text control and measure its bounds.  */
+  if (err == noErr)
+    {
+      CFStringRef message_string;
+      Rect bounds;
+
+      message_string = cfstring_create_with_utf8_cstring (message);
+      if (message_string == NULL)
+        err = memFullErr;
+      else
+        {
+          ControlFontStyleRec text_style;
+
+          text_style.flags = 0;
+          SetRect (&bounds, 0, 0, inner_width, 0);
+          err = CreateStaticTextControl (window, &bounds, message_string,
+                                         &text_style, &text);
+          CFRelease (message_string);
+        }
+      if (err == noErr)
+        {
+          SInt16 unused;
+
+          bounds = empty_rect;
+          err = GetBestControlRect (text, &bounds, &unused);
+        }
+      if (err == noErr)
+        {
+          text_height = bounds.bottom - bounds.top;
+          if (text_height < DIALOG_TEXT_MIN_HEIGHT)
+            text_height = DIALOG_TEXT_MIN_HEIGHT;
+        }
+    }
+
+  /* Place buttons. */
+  if (err == noErr)
+    {
+      inner_height = (text_height + DIALOG_TEXT_BUTTONS_VERTICAL_SPACE
+                      + buttons_height);
+
+      for (i = 0; i < nb_buttons; i++)
+        {
+          OffsetRect (&rects[i], DIALOG_LEFT_MARGIN + inner_width,
+                      DIALOG_TOP_MARGIN + inner_height);
+          SetControlBounds (buttons[i], &rects[i]);
+        }
+    }
 
+  /* Place text.  */
+  if (err == noErr)
+    {
+      Rect bounds;
+
+      SetRect (&bounds, DIALOG_LEFT_MARGIN, DIALOG_TOP_MARGIN,
+               DIALOG_LEFT_MARGIN + inner_width,
+               DIALOG_TOP_MARGIN + text_height);
+      SetControlBounds (text, &bounds);
+    }
+
+  /* Create the application icon at the upper-left corner.  */
+  if (err == noErr)
+    {
+      ControlButtonContentInfo content;
+      ControlRef icon;
+      static const ProcessSerialNumber psn = {0, kCurrentProcess};
+#ifdef MAC_OSX
+      FSRef app_location;
+#else
+      ProcessInfoRec pinfo;
+      FSSpec app_spec;
+#endif
+      SInt16 unused;
+
+      content.contentType = kControlContentIconRef;
+#ifdef MAC_OSX
+      err = GetProcessBundleLocation (&psn, &app_location);
+      if (err == noErr)
+        err = GetIconRefFromFileInfo (&app_location, 0, NULL, 0, NULL,
+                                      kIconServicesNormalUsageFlag,
+                                      &content.u.iconRef, &unused);
+#else
+      bzero (&pinfo, sizeof (ProcessInfoRec));
+      pinfo.processInfoLength = sizeof (ProcessInfoRec);
+      pinfo.processAppSpec = &app_spec;
+      err = GetProcessInformation (&psn, &pinfo);
+      if (err == noErr)
+        err = GetIconRefFromFile (&app_spec, &content.u.iconRef, &unused);
+#endif
+      if (err == noErr)
+        {
+          Rect bounds;
+
+          SetRect (&bounds, DIALOG_ICON_LEFT_MARGIN, DIALOG_ICON_TOP_MARGIN,
+                   DIALOG_ICON_LEFT_MARGIN + DIALOG_ICON_WIDTH,
+                   DIALOG_ICON_TOP_MARGIN + DIALOG_ICON_HEIGHT);
+          err = CreateIconControl (window, &bounds, &content, true, &icon);
+          ReleaseIconRef (content.u.iconRef);
+        }
+    }
+
+  /* Show the dialog window and run event loop.  */
+  if (err == noErr)
+    if (default_button)
+      err = SetWindowDefaultButton (window, default_button);
+  if (err == noErr)
+    err = install_dialog_event_handler (window);
+  if (err == noErr)
+    {
+      SizeWindow (window,
+                  DIALOG_LEFT_MARGIN + inner_width + DIALOG_RIGHT_MARGIN,
+                  DIALOG_TOP_MARGIN + inner_height + DIALOG_BOTTOM_MARGIN,
+                  true);
+      err = RepositionWindow (window, FRAME_MAC_WINDOW (f),
+                              kWindowAlertPositionOnParentWindow);
+    }
+  if (err == noErr)
+    {
+      SetWRefCon (window, 0);
+      ShowWindow (window);
+      BringToFront (window);
+      err = RunAppModalLoopForWindow (window);
+    }
+  if (err == noErr)
+    {
+      UInt32 command_id = GetWRefCon (window);
+
+      if ((command_id & ~0xffff) == 'Bt\0\0')
+        result = command_id - 'Bt\0\0';
+    }
+
+  if (window)
+    DisposeWindow (window);
+
+  return result;
+}
+#else  /* not TARGET_API_MAC_CARBON */
 static int
 mac_dialog (widget_value *wv)
 {
@@ -2425,6 +2808,7 @@ mac_dialog (widget_value *wv)
 
   return i;
 }
+#endif  /* not TARGET_API_MAC_CARBON */
 
 static char * button_names [] = {
   "button1", "button2", "button3", "button4", "button5",
@@ -2557,10 +2941,10 @@ mac_dialog_show (f, keymaps, title, header, error_name)
   }
 
   /* Actually create the dialog.  */
-#ifdef HAVE_DIALOGS
-  menu_item_selection = mac_dialog (first_wv);
+#if TARGET_API_MAC_CARBON
+  menu_item_selection = create_and_show_dialog (f, first_wv);
 #else
-  menu_item_selection = 0;
+  menu_item_selection = mac_dialog (first_wv);
 #endif
 
   /* Free the widget_value objects we used to specify the contents.  */
diff --git a/src/macros.c b/src/macros.c
index fb452e4e318..40fb429d41d 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macros.h b/src/macros.h
index bdd510456b0..2fb01667918 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -1,6 +1,6 @@
 /* Definitions for keyboard macro interpretation in GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macselect.c b/src/macselect.c
index 8d15db24144..8e86c7651e2 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -1,5 +1,5 @@
 /* Selection processing for Emacs on Mac OS.
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1390,7 +1390,7 @@ nil, which means the event is already resumed or expired.  */)
       ae = *p;
       *p = (*p)->next;
       if (INTEGERP (error_code)
-          && ae->apple_event.descriptorType != typeNull)
+          && ae->reply.descriptorType != typeNull)
         {
           SInt32 errn = XINT (error_code);
 
@@ -1562,10 +1562,17 @@ mac_do_receive_drag (window, refcon, drag)
       GlobalToLocal (&mouse_pos);
       err = GetDragModifiers (drag, NULL, NULL, &modifiers);
     }
+  if (err == noErr)
+    {
+      UInt32 key_modifiers = modifiers;
+
+      err = AEPutParamPtr (&apple_event, kEventParamKeyModifiers,
+                           typeUInt32, &key_modifiers, sizeof (UInt32));
+    }
 
   if (err == noErr)
     {
-      mac_store_drag_event (window, mouse_pos, modifiers, &apple_event);
+      mac_store_drag_event (window, mouse_pos, 0, &apple_event);
       AEDisposeDesc (&apple_event);
       mac_wakeup_from_rne ();
       return noErr;
diff --git a/src/macterm.c b/src/macterm.c
index 1706da48cc3..8ba62f2308f 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6572,6 +6572,9 @@ x_free_frame_resources (f)
   if (wp != tip_window)
     remove_window_handler (wp);
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   DisposeWindow (wp);
   if (wp == tip_window)
     /* Neither WaitNextEvent nor ReceiveNextEvent receives `window
@@ -9052,6 +9055,38 @@ mac_get_emulated_btn ( UInt32 modifiers )
   return result;
 }
 
+#if TARGET_API_MAC_CARBON
+/***** Code to handle C-g testing  *****/
+extern int quit_char;
+extern int make_ctrl_char P_ ((int));
+
+int
+mac_quit_char_key_p (modifiers, key_code)
+     UInt32 modifiers, key_code;
+{
+  UInt32 char_code;
+  unsigned long some_state = 0;
+  Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
+  int c, emacs_modifiers;
+
+  /* Mask off modifier keys that are mapped to some Emacs modifiers.  */
+  key_code |= (modifiers & ~(mac_mapped_modifiers (modifiers)));
+  char_code = KeyTranslate (kchr_ptr, key_code, &some_state);
+  if (char_code & ~0xff)
+    return 0;
+
+  emacs_modifiers = mac_to_emacs_modifiers (modifiers);
+  if (emacs_modifiers & ctrl_modifier)
+    c = make_ctrl_char (char_code);
+
+  c |= (emacs_modifiers
+        & (meta_modifier | alt_modifier
+           | hyper_modifier | super_modifier));
+
+  return c == quit_char;
+}
+#endif
+
 #if USE_CARBON_EVENTS
 /* Obtains the event modifiers from the event ref and then calls
    mac_to_emacs_modifiers.  */
@@ -11607,35 +11642,6 @@ x_delete_display (dpyinfo)
 
 #ifdef MAC_OSX
 void
-mac_check_bundle()
-{
-  extern int inhibit_window_system;
-  extern int noninteractive;
-  CFBundleRef appsBundle;
-
-  /* No need to test if already -nw*/
-  if (inhibit_window_system || noninteractive)
-    return;
-
-  appsBundle = CFBundleGetMainBundle();
-  if (appsBundle != NULL)
-    {
-      CFStringRef cfBI = CFSTR("CFBundleIdentifier");
-      CFTypeRef res = CFBundleGetValueForInfoDictionaryKey(appsBundle, cfBI);
-      /* We found the bundle identifier, now we know we are valid. */
-      if (res != NULL)
-        {
-          CFRelease(res);
-          return;
-        }
-    }
-  /* MAC_TODO:  Have this start the bundled executable */
-
-  /* For now, prevent the fatal error by bringing it up in the terminal */
-  inhibit_window_system = 1;
-}
-
-void
 MakeMeTheFrontProcess ()
 {
   ProcessSerialNumber psn;
@@ -11645,36 +11651,6 @@ MakeMeTheFrontProcess ()
   if (err == noErr)
     (void) SetFrontProcess (&psn);
 }
-
-/***** Code to handle C-g testing  *****/
-extern int quit_char;
-extern int make_ctrl_char P_ ((int));
-
-int
-mac_quit_char_key_p (modifiers, key_code)
-     UInt32 modifiers, key_code;
-{
-  UInt32 char_code;
-  unsigned long some_state = 0;
-  Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
-  int c, emacs_modifiers;
-
-  /* Mask off modifier keys that are mapped to some Emacs modifiers.  */
-  key_code |= (modifiers & ~(mac_mapped_modifiers (modifiers)));
-  char_code = KeyTranslate (kchr_ptr, key_code, &some_state);
-  if (char_code & ~0xff)
-    return 0;
-
-  emacs_modifiers = mac_to_emacs_modifiers (modifiers);
-  if (emacs_modifiers & ctrl_modifier)
-    c = make_ctrl_char (char_code);
-
-  c |= (emacs_modifiers
-        & (meta_modifier | alt_modifier
-           | hyper_modifier | super_modifier));
-
-  return c == quit_char;
-}
 #endif  /* MAC_OSX */
 
 static void
diff --git a/src/macterm.h b/src/macterm.h
index c7d86f157f1..0f474e1b3d8 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -522,8 +522,8 @@ struct scroll_bar {
 #define MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH (11)
 
 /* Size of hourglass controls */
-#define HOURGLASS_WIDTH 16
-#define HOURGLASS_HEIGHT 16
+#define HOURGLASS_WIDTH (16)
+#define HOURGLASS_HEIGHT (16)
 
 /* Some constants that are used locally.  */
 /* Creator code for Emacs on Mac OS.  */
@@ -633,9 +633,7 @@ extern void do_apple_menu P_ ((SInt16));
 #if USE_CG_DRAWING
 extern void mac_prepare_for_quickdraw P_ ((struct frame *));
 #endif
-#ifdef MAC_OSX
 extern int mac_quit_char_key_p P_ ((UInt32, UInt32));
-#endif
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index e8d30a31cc5..c796a52fe2c 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, 2006 Free Software Foundation, Inc.
+#                2005, 2006, 2007 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
diff --git a/src/marker.c b/src/marker.c
index 727e97900c2..31849782f6c 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/md5.c b/src/md5.c
index 0daf2c3ef7c..4d8c6d890fe 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 202b2749504..a23dbd089ba 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 45dabca3ac5..30d57d8b51c 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/minibuf.c b/src/minibuf.c
index 3778d185e97..bdd810cb201 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1,7 +1,7 @@
 /* Minibuffer input and completion.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
                  2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1236,22 +1236,25 @@ minibuf_conform_representation (string, basis)
 }
 
 DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0,
-       doc: /* Return common substring of all completions of STRING in ALIST.
-Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.  The possible matches may be
+       doc: /* Return common substring of all completions of STRING in COLLECTION.
+Test each possible completion specified by COLLECTION
+to see if it begins with STRING.  The possible completions may be
 strings or symbols.  Symbols are converted to strings before testing,
 see `symbol-name'.
-All that match are compared together; the longest initial sequence
-common to all matches is returned as a string.
-If there is no match at all, nil is returned.
-For a unique match which is exact, t is returned.
-
-If ALIST is a hash-table, all the string and symbol keys are the
-possible matches.
-If ALIST is an obarray, the names of all symbols in the obarray
-are the possible matches.
-
-ALIST can also be a function to do the completion itself.
+All that match STRING are compared together; the longest initial sequence
+common to all these matches is the return value.
+If there is no match at all, the return value is nil.
+For a unique match which is exact, the return value is t.
+
+If COLLECTION is an alist, the keys (cars of elements) are the
+possible completions.  If an element is not a cons cell, then the
+element itself is the possible completion.
+If COLLECTION is a hash-table, all the keys that are strings or symbols
+are the possible completions.
+If COLLECTION is an obarray, the names of all symbols in the obarray
+are the possible completions.
+
+COLLECTION can also be a function to do the completion itself.
 It receives three arguments: the values STRING, PREDICATE and nil.
 Whatever it returns becomes the value of `try-completion'.
 
@@ -1259,23 +1262,23 @@ If optional third argument PREDICATE is non-nil,
 it is used to test each possible match.
 The match is a candidate only if PREDICATE returns non-nil.
 The argument given to PREDICATE is the alist element
-or the symbol from the obarray.  If ALIST is a hash-table,
+or the symbol from the obarray.  If COLLECTION is a hash-table,
 predicate is called with two arguments: the key and the value.
 Additionally to this predicate, `completion-regexp-list'
 is used to further constrain the set of candidates.  */)
-     (string, alist, predicate)
-     Lisp_Object string, alist, predicate;
+     (string, collection, predicate)
+     Lisp_Object string, collection, predicate;
 {
   Lisp_Object bestmatch, tail, elt, eltstring;
   /* Size in bytes of BESTMATCH.  */
   int bestmatchsize = 0;
   /* These are in bytes, too.  */
   int compare, matchsize;
-  int type = (HASH_TABLE_P (alist) ? 3
-              : VECTORP (alist) ? 2
-              : NILP (alist) || (CONSP (alist)
-                                 && (!SYMBOLP (XCAR (alist))
-                                     || NILP (XCAR (alist)))));
+  int type = (HASH_TABLE_P (collection) ? 3
+              : VECTORP (collection) ? 2
+              : NILP (collection) || (CONSP (collection)
+                                      && (!SYMBOLP (XCAR (collection))
+                                          || NILP (XCAR (collection)))));
   int index = 0, obsize = 0;
   int matchcount = 0;
   int bindcount = -1;
@@ -1284,18 +1287,18 @@ is used to further constrain the set of candidates.  */)
 
   CHECK_STRING (string);
   if (type == 0)
-    return call3 (alist, string, predicate, Qnil);
+    return call3 (collection, string, predicate, Qnil);
 
   bestmatch = bucket = Qnil;
   zero = make_number (0);
 
-  /* If ALIST is not a list, set TAIL just for gc pro.  */
-  tail = alist;
+  /* If COLLECTION is not a list, set TAIL just for gc pro.  */
+  tail = collection;
   if (type == 2)
     {
-      alist = check_obarray (alist);
-      obsize = XVECTOR (alist)->size;
-      bucket = XVECTOR (alist)->contents[index];
+      collection = check_obarray (collection);
+      obsize = XVECTOR (collection)->size;
+      bucket = XVECTOR (collection)->contents[index];
     }
 
   while (1)
@@ -1330,19 +1333,19 @@ is used to further constrain the set of candidates.  */)
             break;
           else
             {
-              bucket = XVECTOR (alist)->contents[index];
+              bucket = XVECTOR (collection)->contents[index];
               continue;
             }
         }
       else /* if (type == 3) */
         {
-          while (index < HASH_TABLE_SIZE (XHASH_TABLE (alist))
-                 && NILP (HASH_HASH (XHASH_TABLE (alist), index)))
+          while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection))
+                 && NILP (HASH_HASH (XHASH_TABLE (collection), index)))
             index++;
-          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (alist)))
+          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection)))
             break;
           else
-            elt = eltstring = HASH_KEY (XHASH_TABLE (alist), index++);
+            elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++);
         }
 
       /* Is this element a possible completion? */
@@ -1395,7 +1398,7 @@ is used to further constrain the set of candidates.  */)
                   GCPRO4 (tail, string, eltstring, bestmatch);
                   tem = type == 3
                     ? call2 (predicate, elt,
-                             HASH_VALUE (XHASH_TABLE (alist), index - 1))
+                             HASH_VALUE (XHASH_TABLE (collection), index - 1))
                     : call1 (predicate, elt);
                   UNGCPRO;
                 }
@@ -1504,19 +1507,22 @@ is used to further constrain the set of candidates.  */)
 }
 
 DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
-       doc: /* Search for partial matches to STRING in ALIST.
-Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.  The possible matches may be
+       doc: /* Search for partial matches to STRING in COLLECTION.
+Test each of the possible completions specified by COLLECTION
+to see if it begins with STRING.  The possible completions may be
 strings or symbols.  Symbols are converted to strings before testing,
 see `symbol-name'.
-The value is a list of all the strings from ALIST that match.
+The value is a list of all the possible completions that match STRING.
 
-If ALIST is a hash-table, all the string and symbol keys are the
-possible matches.
-If ALIST is an obarray, the names of all symbols in the obarray
-are the possible matches.
+If COLLECTION is an alist, the keys (cars of elements) are the
+possible completions.  If an element is not a cons cell, then the
+element itself is the possible completion.
+If COLLECTION is a hash-table, all the keys that are strings or symbols
+are the possible completions.
+If COLLECTION is an obarray, the names of all symbols in the obarray
+are the possible completions.
 
-ALIST can also be a function to do the completion itself.
+COLLECTION can also be a function to do the completion itself.
 It receives three arguments: the values STRING, PREDICATE and t.
 Whatever it returns becomes the value of `all-completions'.
 
@@ -1524,24 +1530,24 @@ If optional third argument PREDICATE is non-nil,
 it is used to test each possible match.
 The match is a candidate only if PREDICATE returns non-nil.
 The argument given to PREDICATE is the alist element
-or the symbol from the obarray.  If ALIST is a hash-table,
+or the symbol from the obarray.  If COLLECTION is a hash-table,
 predicate is called with two arguments: the key and the value.
 Additionally to this predicate, `completion-regexp-list'
 is used to further constrain the set of candidates.
 
 If the optional fourth argument HIDE-SPACES is non-nil,
-strings in ALIST that start with a space
+strings in COLLECTION that start with a space
 are ignored unless STRING itself starts with a space.  */)
-     (string, alist, predicate, hide_spaces)
-     Lisp_Object string, alist, predicate, hide_spaces;
+     (string, collection, predicate, hide_spaces)
+     Lisp_Object string, collection, predicate, hide_spaces;
 {
   Lisp_Object tail, elt, eltstring;
   Lisp_Object allmatches;
-  int type = HASH_TABLE_P (alist) ? 3
-    : VECTORP (alist) ? 2
-    : NILP (alist) || (CONSP (alist)
-                       && (!SYMBOLP (XCAR (alist))
-                           || NILP (XCAR (alist))));
+  int type = HASH_TABLE_P (collection) ? 3
+    : VECTORP (collection) ? 2
+    : NILP (collection) || (CONSP (collection)
+                            && (!SYMBOLP (XCAR (collection))
+                                || NILP (XCAR (collection))));
   int index = 0, obsize = 0;
   int bindcount = -1;
   Lisp_Object bucket, tem, zero;
@@ -1549,16 +1555,16 @@ are ignored unless STRING itself starts with a space.  */)
 
   CHECK_STRING (string);
   if (type == 0)
-    return call3 (alist, string, predicate, Qt);
+    return call3 (collection, string, predicate, Qt);
   allmatches = bucket = Qnil;
   zero = make_number (0);
 
-  /* If ALIST is not a list, set TAIL just for gc pro.  */
-  tail = alist;
+  /* If COLLECTION is not a list, set TAIL just for gc pro.  */
+  tail = collection;
   if (type == 2)
     {
-      obsize = XVECTOR (alist)->size;
-      bucket = XVECTOR (alist)->contents[index];
+      obsize = XVECTOR (collection)->size;
+      bucket = XVECTOR (collection)->contents[index];
     }
 
   while (1)
@@ -1591,19 +1597,19 @@ are ignored unless STRING itself starts with a space.  */)
             break;
           else
             {
-              bucket = XVECTOR (alist)->contents[index];
+              bucket = XVECTOR (collection)->contents[index];
               continue;
             }
         }
       else /* if (type == 3) */
         {
-          while (index < HASH_TABLE_SIZE (XHASH_TABLE (alist))
-                 && NILP (HASH_HASH (XHASH_TABLE (alist), index)))
+          while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection))
+                 && NILP (HASH_HASH (XHASH_TABLE (collection), index)))
             index++;
-          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (alist)))
+          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection)))
             break;
           else
-            elt = eltstring = HASH_KEY (XHASH_TABLE (alist), index++);
+            elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++);
         }
 
       /* Is this element a possible completion? */
@@ -1665,7 +1671,7 @@ are ignored unless STRING itself starts with a space.  */)
                   GCPRO4 (tail, eltstring, allmatches, string);
                   tem = type == 3
                     ? call2 (predicate, elt,
-                             HASH_VALUE (XHASH_TABLE (alist), index - 1))
+                             HASH_VALUE (XHASH_TABLE (collection), index - 1))
                     : call1 (predicate, elt);
                   UNGCPRO;
                 }
@@ -1692,14 +1698,14 @@ Lisp_Object Vminibuffer_completing_file_name;
 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
        doc: /* Read a string in the minibuffer, with completion.
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
-TABLE can be a list of strings, an alist, an obarray or a hash table.
-TABLE can also be a function to do the completion itself.
-PREDICATE limits completion to a subset of TABLE.
+COLLECTION can be a list of strings, an alist, an obarray or a hash table.
+COLLECTION can also be a function to do the completion itself.
+PREDICATE limits completion to a subset of COLLECTION.
 See `try-completion' and `all-completions' for more details
- on completion, TABLE, and PREDICATE.
+ on completion, COLLECTION, and PREDICATE.
 
 If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless
- the input is (or completes to) an element of TABLE or is null.
+ the input is (or completes to) an element of COLLECTION or is null.
  If it is also not t, typing RET does not exit if it does non-null completion.
 If the input is null, `completing-read' returns DEF, or an empty string
  if DEF is nil, regardless of the value of REQUIRE-MATCH.
@@ -1733,8 +1739,8 @@ If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits
 
 Completion ignores case if the ambient value of
   `completion-ignore-case' is non-nil.  */)
-     (prompt, table, predicate, require_match, initial_input, hist, def, inherit_input_method)
-     Lisp_Object prompt, table, predicate, require_match, initial_input;
+     (prompt, collection, predicate, require_match, initial_input, hist, def, inherit_input_method)
+     Lisp_Object prompt, collection, predicate, require_match, initial_input;
      Lisp_Object hist, def, inherit_input_method;
 {
   Lisp_Object val, histvar, histpos, position;
@@ -1746,7 +1752,7 @@ Completion ignores case if the ambient value of
   init = initial_input;
   GCPRO1 (def);
 
-  specbind (Qminibuffer_completion_table, table);
+  specbind (Qminibuffer_completion_table, collection);
   specbind (Qminibuffer_completion_predicate, predicate);
   specbind (Qminibuffer_completion_confirm,
             EQ (require_match, Qt) ? Qnil : require_match);
@@ -1808,27 +1814,28 @@ Lisp_Object Fassoc_string ();
 DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
        doc: /* Return non-nil if STRING is a valid completion.
 Takes the same arguments as `all-completions' and `try-completion'.
-If ALIST is a function, it is called with three arguments:
+If COLLECTION is a function, it is called with three arguments:
 the values STRING, PREDICATE and `lambda'.  */)
-       (string, alist, predicate)
-     Lisp_Object string, alist, predicate;
+       (string, collection, predicate)
+     Lisp_Object string, collection, predicate;
 {
   Lisp_Object regexps, tail, tem = Qnil;
   int i = 0;
 
   CHECK_STRING (string);
 
-  if ((CONSP (alist) && (!SYMBOLP (XCAR (alist)) || NILP (XCAR (alist))))
-      || NILP (alist))
+  if ((CONSP (collection)
+       && (!SYMBOLP (XCAR (collection)) || NILP (XCAR (collection))))
+      || NILP (collection))
     {
-      tem = Fassoc_string (string, alist, completion_ignore_case ? Qt : Qnil);
+      tem = Fassoc_string (string, collection, completion_ignore_case ? Qt : Qnil);
       if (NILP (tem))
         return Qnil;
     }
-  else if (VECTORP (alist))
+  else if (VECTORP (collection))
     {
       /* Bypass intern-soft as that loses for nil.  */
-      tem = oblookup (alist,
+      tem = oblookup (collection,
                       SDATA (string),
                       SCHARS (string),
                       SBYTES (string));
@@ -1839,7 +1846,7 @@ the values STRING, PREDICATE and `lambda'.  */)
           else
             string = Fstring_make_multibyte (string);
 
-          tem = oblookup (alist,
+          tem = oblookup (collection,
                           SDATA (string),
                           SCHARS (string),
                           SBYTES (string));
@@ -1847,9 +1854,9 @@ the values STRING, PREDICATE and `lambda'.  */)
 
       if (completion_ignore_case && !SYMBOLP (tem))
         {
-          for (i = XVECTOR (alist)->size - 1; i >= 0; i--)
+          for (i = XVECTOR (collection)->size - 1; i >= 0; i--)
             {
-              tail = XVECTOR (alist)->contents[i];
+              tail = XVECTOR (collection)->contents[i];
               if (SYMBOLP (tail))
                 while (1)
                   {
@@ -1871,9 +1878,9 @@ the values STRING, PREDICATE and `lambda'.  */)
       if (!SYMBOLP (tem))
         return Qnil;
     }
-  else if (HASH_TABLE_P (alist))
+  else if (HASH_TABLE_P (collection))
     {
-      struct Lisp_Hash_Table *h = XHASH_TABLE (alist);
+      struct Lisp_Hash_Table *h = XHASH_TABLE (collection);
       i = hash_lookup (h, string, NULL);
       if (i >= 0)
         tem = HASH_KEY (h, i);
@@ -1892,7 +1899,7 @@ the values STRING, PREDICATE and `lambda'.  */)
         return Qnil;
     }
   else
-    return call3 (alist, string, predicate, Qlambda);
+    return call3 (collection, string, predicate, Qlambda);
 
   /* Reject this element if it fails to match all the regexps.  */
   if (CONSP (Vcompletion_regexp_list))
@@ -1913,8 +1920,8 @@ the values STRING, PREDICATE and `lambda'.  */)
   /* Finally, check the predicate.  */
   if (!NILP (predicate))
     {
-      return HASH_TABLE_P (alist)
-        ? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (alist), i))
+      return HASH_TABLE_P (collection)
+        ? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (collection), i))
         : call1 (predicate, tem);
     }
   else
diff --git a/src/mktime.c b/src/mktime.c
index a85ebeb3783..20c1092a62a 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  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 6413fed0014..f9ce739fd5b 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, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/msdos.h b/src/msdos.h
index cbe65818867..7a6d2e64ca0 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/prefix-args.c b/src/prefix-args.c
index ad634585168..1fead09247d 100644
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -1,6 +1,6 @@
 /* prefix-args.c - echo each argument, prefixed by a string.
-   Copyright (C) 1992, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/print.c b/src/print.c
index 5d650813458..883daa55e2b 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/process.c b/src/process.c
index f6dad808ffe..38a5c8341cf 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -815,9 +815,12 @@ nil, indicating the current buffer's process.  */)
     {
 #ifdef SIGCHLD
       Lisp_Object symbol;
+      /* Assignment to EMACS_INT stops GCC whining about limited range
+         of data type.  */
+      EMACS_INT pid = p->pid;;
 
       /* No problem storing the pid here, as it is still in Vprocess_alist.  */
-      deleted_pid_list = Fcons (make_fixnum_or_float (p->pid),
+      deleted_pid_list = Fcons (make_fixnum_or_float (pid),
                                 /* GC treated elements set to nil.  */
                                 Fdelq (Qnil, deleted_pid_list));
       /* If the process has already signaled, remove it from the list.  */
@@ -827,7 +830,7 @@ nil, indicating the current buffer's process.  */)
       if (CONSP (p->status))
         symbol = XCAR (p->status);
       if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
-        Fdelete (make_fixnum_or_float (p->pid), deleted_pid_list);
+        Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
       else
 #endif
         {
@@ -912,10 +915,13 @@ For a network connection, this value is nil.  */)
      (process)
      register Lisp_Object process;
 {
+  /* Assignment to EMACS_INT stops GCC whining about limited range of
+     data type.  */
+  EMACS_INT pid;
+
   CHECK_PROCESS (process);
-  return (XPROCESS (process)->pid
-          ? make_fixnum_or_float (XPROCESS (process)->pid)
-          : Qnil);
+  pid = XPROCESS (process)->pid;
+  return (pid ? make_fixnum_or_float (pid) : Qnil);
 }
 
 DEFUN ("process-name", Fprocess_name, Sprocess_name, 1, 1, 0,
@@ -6410,7 +6416,7 @@ sigchld_handler (signo)
 
   while (1)
     {
-      register int pid;
+      register EMACS_INT pid;
       WAITTYPE w;
       Lisp_Object tail;
 
diff --git a/src/process.h b/src/process.h
index fcf8d9b6c1f..718d2a70ea8 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/puresize.h b/src/puresize.h
index bd8d74f4df6..733d63e5ca6 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -1,6 +1,6 @@
 /* How much read-only Lisp storage a dumped Emacs needs.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/ralloc.c b/src/ralloc.c
index 83a26dd35d6..7b319556117 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/regex.c b/src/regex.c
index b1307743f0f..7784a3ae616 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3,7 +3,7 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/regex.h b/src/regex.h
index 14817c35e90..dd57ba36f57 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -1,8 +1,9 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
-   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 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 cedb0017da0..f30e00470f7 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/region-cache.h b/src/region-cache.h
index 40e68084cce..27176d80dbc 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 f77a209f0d2..204baa40f07 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 3e6a44f1fab..2b11ba2302f 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 ace519c0d74..40c655bea87 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 483effe71c1..249cf34f41b 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cxux.h b/src/s/cxux.h
index 3c4ffcd24a2..daed2fc85d8 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -1,6 +1,6 @@
 /* Header file for Harris CXUX.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 749d1a38e3e..eff48e339cb 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 91975cd441b..7175ea5457c 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,6 +1,6 @@
 /* System description header file for Darwin (Mac OS X).
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux.h b/src/s/dgux.h
index d48d95709c8..62194a2fc6e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index ee24cd65b50..01d75650e6f 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -1,7 +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,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 d0f6d4f43e8..c9f471af05a 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -1,7 +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,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 be0ba73b4e0..fef2da7d29d 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -1,7 +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,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 78f314700b3..3adca71bebc 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, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 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 7116d24c718..24a37f964db 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 71f1dd34a5e..c4f1a798d9e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/hpux.h b/src/s/hpux.h
index b8f9c62a893..c0419fbad46 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 6b0009c1c38..abbd945ab2f 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 d0c68bd89cb..192118eeca7 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 a65242179a9..1512077fe49 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index b822bad3691..faa036037f5 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 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 06b1f8960f0..ad699dff035 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 966384ee352..0bb5a678ae3 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index 0b441d74e24..b548a47ffbe 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 8ea45e16e6e..2923712d929 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/ptx.h b/src/s/ptx.h
index 319bbc049f2..edbbe5b2ac4 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 d6281d256b6..682ba06720a 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index a4811877070..d082e442810 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/rtu.h b/src/s/rtu.h
index 2a9df14a14c..1517165877b 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco4.h b/src/s/sco4.h
index 0eda0a3f728..96e812ce0e4 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 06166f32fd9..6ab7b60e466 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -1,5 +1,6 @@
 /* System description file for SCO 3.2v5.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/template.h b/src/s/template.h
index 94b3787811f..c16b12971ad 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -1,8 +1,8 @@
 /* Template for system description header files.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/umax.h b/src/s/umax.h
index ae3b98cfcad..5d379ea398a 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 096096f9f7a..0d4aba8ea2b 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 94389290726..101e75726ef 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 a60a985856d..b2c89a1abdc 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 7f1fcb92ec5..13a9885fb53 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 56a448e9dba..0e0a1c84829 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 5e202e3edad..4ca5b6fcabc 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/vms.h b/src/s/vms.h
index 51f3ca1a531..4d9bbaebb07 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -1,6 +1,6 @@
 /* system description header for VMS
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 09a7b61fcd1..6d77ef50acc 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/scroll.c b/src/scroll.c
index 9b04f47c16b..964e7ba9037 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/search.c b/src/search.c
index 3fc3faeda98..abc28619199 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sheap.c b/src/sheap.c
index 03da2afa813..510a75d4743 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sound.c b/src/sound.c
index b6f5ff513ee..7fb79e64048 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/strftime.c b/src/strftime.c
index 88800c0d408..7a9506e55d3 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 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 336f02221cf..c532ae7f849 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 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 52527a0516d..a9e6dda81fe 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1,6 +1,7 @@
 /* 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syntax.h b/src/syntax.h
index 92d55967b33..f64aa0e1327 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1993, 1994, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 1068c7a1773..87998088753 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sysselect.h b/src/sysselect.h
index ba204dafe3f..d72ff90ac0b 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,6 +1,6 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syssignal.h b/src/syssignal.h
index ac77759d258..69ff7a41bd1 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -211,7 +211,7 @@ char *strsignal ();
 #ifdef HAVE_GTK_AND_PTHREAD
 #define SIGNAL_THREAD_CHECK(signo)                                      \
   do {                                                                  \
-    if (pthread_self () != main_thread)                                 \
+    if (!pthread_equal (pthread_self (), main_thread))                  \
       {                                                                 \
         /* POSIX says any thread can receive the signal.  On GNU/Linux  \
            that is not true, but for other systems (FreeBSD at least)   \
diff --git a/src/systime.h b/src/systime.h
index e7ff2b2a3b7..ac28d883d64 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/systty.h b/src/systty.h
index 6d6a6f01ea9..d1eb3b84597 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syswait.h b/src/syswait.h
index bb4937f353e..e70e992d545 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/term.c b/src/term.c
index 00c72ea8bee..a12f982844c 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termcap.c b/src/termcap.c
index dee5465ebf9..111565131b5 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, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 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 c0d9895462e..9bc3e21d220 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termhooks.h b/src/termhooks.h
index 98c4edb4f24..72e0940cea6 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/terminfo.c b/src/terminfo.c
index 7fccfaf1700..99f8b9a1e4e 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termopts.h b/src/termopts.h
index 8d776b3de38..082f9b15af7 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/textprop.c b/src/textprop.c
index a039c17ae64..b98acaeccd8 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, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/tparam.c b/src/tparam.c
index ea04f7eaea1..dea57ff7461 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 05a8651b6c2..c00fc7732fe 100644
--- a/src/uaf.h
+++ b/src/uaf.h
@@ -1,6 +1,6 @@
 /* GNU Emacs VMS UAF definition file.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/undo.c b/src/undo.c
index 3313c8e306c..0eca97df566 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexaix.c b/src/unexaix.c
index 4785aa1dcb3..41324ac0fd8 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexalpha.c b/src/unexalpha.c
index ead259437f6..cbd44616bd4 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexapollo.c b/src/unexapollo.c
index ace28dfa38d..27cf968c5fe 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 8409463b783..598b1b3428b 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -7,8 +7,8 @@
    think about it, or about whether other Emacs maintenance might
    break it.
 
-   Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1988, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexcw.c b/src/unexcw.c
index 92e313c05d6..f1023d4b239 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexec.c b/src/unexec.c
index 7fe7e26568c..16f9c96faa7 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, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexelf.c b/src/unexelf.c
index a236b98eab1..7b2c72f0fa9 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexenix.c b/src/unexenix.c
index c1ad8bbf7eb..4d4bec11eb6 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -6,8 +6,8 @@
    we don't plan to think about it, or about whether other Emacs
    maintenance might break it.
 
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
deleted file mode 100644
index 146cc5707da..00000000000
--- a/src/unexhp9k800.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* Unexec for HP 9000 Series 800 machines.
-   Bob Desinger <hpsemc!bd@hplabs.hp.com>
-
-   Note that the GNU project considers support for HP operation a
-   peripheral activity which should not be allowed to divert effort
-   from development of the GNU system.  Changes in this code will be
-   installed when users send them in, but aside from that we don't
-   plan to think about it, or about whether other Emacs maintenance
-   might break it.
-
-
-  Unexec creates a copy of the old a.out file, and replaces the old data
-  area with the current data area.  When the new file is executed, the
-  process will see the same data structures and data values that the
-  original process had when unexec was called.
-
-  Unlike other versions of unexec, this one copies symbol table and
-  debug information to the new a.out file.  Thus, the new a.out file
-  may be debugged with symbolic debuggers.
-
-  If you fix any bugs in this, I'd like to incorporate your fixes.
-  Send them to uunet!hpda!hpsemc!jmorris or jmorris%hpsemc@hplabs.HP.COM.
-
-  CAVEATS:
-  This routine saves the current value of all static and external
-  variables.  This means that any data structure that needs to be
-  initialized must be explicitly reset.  Variables will not have their
-  expected default values.
-
-  Unfortunately, the HP-UX signal handler has internal initialization
-  flags which are not explicitly reset.  Thus, for signals to work in
-  conjunction with this routine, the following code must executed when
-  the new process starts up.
-
-  void _sigreturn ();
-  ...
-  sigsetreturn (_sigreturn);
-*/
-
-#ifdef emacs
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <a.out.h>
-
-#ifdef HPUX_USE_SHLIBS
-#include <dl.h>
-#endif
-
-/* brk value to restore, stored as a global.
-   This is really used only if we used shared libraries.  */
-static long brk_on_dump = 0;
-
-/* Called from main, if we use shared libraries.  */
-int
-run_time_remap (ignored)
-     char *ignored;
-{
-  brk ((char *) brk_on_dump);
-}
-
-#undef roundup
-#define roundup(x,n) (((x) + ((n) - 1)) & ~((n) - 1))  /* n is power of 2 */
-#define min(x,y)  (((x) < (y)) ? (x) : (y))
-
-
-/* Create a new a.out file, same as old but with current data space */
-
-unexec (new_name, old_name, new_end_of_text, dummy1, dummy2)
-     char new_name[];           /* name of the new a.out file to be created */
-     char old_name[];           /* name of the old a.out file */
-     char *new_end_of_text;     /* ptr to new edata/etext; NOT USED YET */
-     int dummy1, dummy2;        /* not used by emacs */
-{
-  int old, new;
-  int old_size, new_size;
-  struct header hdr;
-  struct som_exec_auxhdr auxhdr;
-  long i;
-
-  /* For the greatest flexibility, should create a temporary file in
-     the same directory as the new file.  When everything is complete,
-     rename the temp file to the new name.
-     This way, a program could update its own a.out file even while
-     it is still executing.  If problems occur, everything is still
-     intact.  NOT implemented.  */
-
-  /* Open the input and output a.out files */
-  old = open (old_name, O_RDONLY);
-  if (old < 0)
-    { perror (old_name); exit (1); }
-  new = open (new_name, O_CREAT|O_RDWR|O_TRUNC, 0777);
-  if (new < 0)
-    { perror (new_name); exit (1); }
-
-  /* Read the old headers */
-  read_header (old, &hdr, &auxhdr);
-
-  brk_on_dump = (long) sbrk (0);
-
-  /* Decide how large the new and old data areas are */
-  old_size = auxhdr.exec_dsize;
-  /* I suspect these two statements are separate
-     to avoid a compiler bug in hpux version 8.  */
-  i = (long) sbrk (0);
-  new_size = i - auxhdr.exec_dmem;
-
-  /* Copy the old file to the new, up to the data space */
-  lseek (old, 0, 0);
-  copy_file (old, new, auxhdr.exec_dfile);
-
-  /* Skip the old data segment and write a new one */
-  lseek (old, old_size, 1);
-  save_data_space (new, &hdr, &auxhdr, new_size);
-
-  /* Copy the rest of the file */
-  copy_rest (old, new);
-
-  /* Update file pointers since we probably changed size of data area */
-  update_file_ptrs (new, &hdr, &auxhdr, auxhdr.exec_dfile, new_size-old_size);
-
-  /* Save the modified header */
-  write_header (new, &hdr, &auxhdr);
-
-  /* Close the binary file */
-  close (old);
-  close (new);
-  return 0;
-}
-
-/* Save current data space in the file, update header.  */
-
-save_data_space (file, hdr, auxhdr, size)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-     int size;
-{
-  /* Write the entire data space out to the file */
-  if (write (file, auxhdr->exec_dmem, size) != size)
-    { perror ("Can't save new data space"); exit (1); }
-
-  /* Update the header to reflect the new data size */
-  auxhdr->exec_dsize = size;
-  auxhdr->exec_bsize = 0;
-}
-
-/* Update the values of file pointers when something is inserted.  */
-
-update_file_ptrs (file, hdr, auxhdr, location, offset)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-     unsigned int location;
-     int offset;
-{
-  struct subspace_dictionary_record subspace;
-  int i;
-
-  /* Increase the overall size of the module */
-  hdr->som_length += offset;
-
-  /* Update the various file pointers in the header */
-#define update(ptr) if (ptr > location) ptr = ptr + offset
-  update (hdr->aux_header_location);
-  update (hdr->space_strings_location);
-  update (hdr->init_array_location);
-  update (hdr->compiler_location);
-  update (hdr->symbol_location);
-  update (hdr->fixup_request_location);
-  update (hdr->symbol_strings_location);
-  update (hdr->unloadable_sp_location);
-  update (auxhdr->exec_tfile);
-  update (auxhdr->exec_dfile);
-
-  /* Do for each subspace dictionary entry */
-  lseek (file, hdr->subspace_location, 0);
-  for (i = 0; i < hdr->subspace_total; i++)
-    {
-      if (read (file, &subspace, sizeof (subspace)) != sizeof (subspace))
-        { perror ("Can't read subspace record"); exit (1); }
-
-      /* If subspace has a file location, update it */
-      if (subspace.initialization_length > 0
-          && subspace.file_loc_init_value > location)
-        {
-          subspace.file_loc_init_value += offset;
-          lseek (file, -sizeof (subspace), 1);
-          if (write (file, &subspace, sizeof (subspace)) != sizeof (subspace))
-            { perror ("Can't update subspace record"); exit (1); }
-        }
-    }
-
-  /* Do for each initialization pointer record */
-  /* (I don't think it applies to executable files, only relocatables) */
-#undef update
-}
-
-/* Read in the header records from an a.out file.  */
-
-read_header (file, hdr, auxhdr)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-
-  /* Read the header in */
-  lseek (file, 0, 0);
-  if (read (file, hdr, sizeof (*hdr)) != sizeof (*hdr))
-    { perror ("Couldn't read header from a.out file"); exit (1); }
-
-  if (hdr->a_magic != EXEC_MAGIC && hdr->a_magic != SHARE_MAGIC
-      &&  hdr->a_magic != DEMAND_MAGIC)
-    {
-      fprintf (stderr, "a.out file doesn't have legal magic number\n");
-      exit (1);
-    }
-
-  lseek (file, hdr->aux_header_location, 0);
-  if (read (file, auxhdr, sizeof (*auxhdr)) != sizeof (*auxhdr))
-    {
-      perror ("Couldn't read auxiliary header from a.out file");
-      exit (1);
-    }
-}
-
-/* Write out the header records into an a.out file.  */
-
-write_header (file, hdr, auxhdr)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-  /* Update the checksum */
-  hdr->checksum = calculate_checksum (hdr);
-
-  /* Write the header back into the a.out file */
-  lseek (file, 0, 0);
-  if (write (file, hdr, sizeof (*hdr)) != sizeof (*hdr))
-    { perror ("Couldn't write header to a.out file"); exit (1); }
-  lseek (file, hdr->aux_header_location, 0);
-  if (write (file, auxhdr, sizeof (*auxhdr)) != sizeof (*auxhdr))
-    { perror ("Couldn't write auxiliary header to a.out file"); exit (1); }
-}
-
-/* Calculate the checksum of a SOM header record. */
-
-calculate_checksum (hdr)
-     struct header *hdr;
-{
-  int checksum, i, *ptr;
-
-  checksum = 0;  ptr = (int *) hdr;
-
-  for (i = 0; i < sizeof (*hdr) / sizeof (int) - 1; i++)
-    checksum ^= ptr[i];
-
-  return (checksum);
-}
-
-/* Copy size bytes from the old file to the new one.  */
-
-copy_file (old, new, size)
-     int new, old;
-     int size;
-{
-  int len;
-  int buffer[8192];  /* word aligned will be faster */
-
-  for (; size > 0; size -= len)
-    {
-      len = min (size, sizeof (buffer));
-      if (read (old, buffer, len) != len)
-        { perror ("Read failure on a.out file"); exit (1); }
-      if (write (new, buffer, len) != len)
-        { perror ("Write failure in a.out file"); exit (1); }
-    }
-}
-
-/* Copy the rest of the file, up to EOF.  */
-
-copy_rest (old, new)
-     int new, old;
-{
-  int buffer[4096];
-  int len;
-
-  /* Copy bytes until end of file or error */
-  while ((len = read (old, buffer, sizeof (buffer))) > 0)
-    if (write (new, buffer, len) != len) break;
-
-  if (len != 0)
-    { perror ("Unable to copy the rest of the file"); exit (1); }
-}
-
-#ifdef  DEBUG
-display_header (hdr, auxhdr)
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-  /* Display the header information (debug) */
-  printf ("\n\nFILE HEADER\n");
-  printf ("magic number %d \n", hdr->a_magic);
-  printf ("text loc %.8x   size %d \n", auxhdr->exec_tmem, auxhdr->exec_tsize);
-  printf ("data loc %.8x   size %d \n", auxhdr->exec_dmem, auxhdr->exec_dsize);
-  printf ("entry     %x \n",   auxhdr->exec_entry);
-  printf ("Bss  segment size %u\n", auxhdr->exec_bsize);
-  printf ("\n");
-  printf ("data file loc %d    size %d\n",
-          auxhdr->exec_dfile, auxhdr->exec_dsize);
-  printf ("som_length %d\n", hdr->som_length);
-  printf ("unloadable sploc %d    size %d\n",
-          hdr->unloadable_sp_location, hdr->unloadable_sp_size);
-}
-#endif /* DEBUG */
-
-/* arch-tag: d55a09ac-9427-4ec4-8496-cb9d7710774f
-   (do not change this comment) */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index e95aa2f2efc..d38053c3155 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1,6 +1,6 @@
 /* Dump Emacs in Mach-O format for use on Mac OS X.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexmips.c b/src/unexmips.c
index 86129e052cf..d80bc62277e 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -6,8 +6,8 @@
    we don't plan to think about it, or about whether other Emacs
    maintenance might break it.
 
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexnext.c b/src/unexnext.c
index b453da3b023..937e5d2b80b 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 8d72acf1a18..def59c6ea84 100644
--- a/src/unexsni.c
+++ b/src/unexsni.c
@@ -1,6 +1,7 @@
 /* Unexec for Siemens machines running Sinix (modified SVR4).
-   Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index 19d982f6140..e8051fc7e88 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexw32.c b/src/unexw32.c
index 6256062aa3f..ae2fe942c73 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -1,6 +1,6 @@
 /* unexec for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/vm-limit.c b/src/vm-limit.c
index cadfb4cc95a..192775df81c 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w16select.c b/src/w16select.c
index ea9d9aea190..82619c15833 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32.c b/src/w32.c
index 9fe88833b4f..87ae9d9f8fd 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32.h b/src/w32.h
index 6ba25a42403..b6fb23dc14d 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -2,8 +2,8 @@
 #define EMACS_W32_H
 
 /* Support routines for the NT version of Emacs.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 89d88574188..64ec2f7a3b0 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -1,6 +1,6 @@
 /* Implementation of BDF font handling on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32bdf.h b/src/w32bdf.h
index dd8cfa276bf..ba408793882 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -1,6 +1,6 @@
 /* Definitions and header for handling BDF fonts on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32console.c b/src/w32console.c
index 0fc652bf55f..d2f0e06a64d 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 34cfb0a2882..885ade0e4bb 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, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32gui.h b/src/w32gui.h
index 2b1a11987f3..18c737a6e12 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32heap.c b/src/w32heap.c
index e1bdd867721..9327e7e7e7e 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -1,6 +1,6 @@
 /* Heap management routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32heap.h b/src/w32heap.h
index c862558b1cf..0d4ccb70b8a 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,6 +1,6 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 0fededa6aea..b44054afef3 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 8985df1ee69..f0f7f232261 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -1,6 +1,6 @@
 /* Input routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32menu.c b/src/w32menu.c
index d5c38bee336..a3bd82a0d7d 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32proc.c b/src/w32proc.c
index 7d27172781d..2120a51fb89 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32reg.c b/src/w32reg.c
index cd2a3bdf755..37659ecb9ca 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32select.c b/src/w32select.c
index 99825c23911..ad5d0e67f83 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32term.c b/src/w32term.c
index 007f9d83afb..8044e23d5ae 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, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32term.h b/src/w32term.h
index f587d74a485..ac312c84a19 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 0e937e9950c..b87cc28f057 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widget.c b/src/widget.c
index 2e9913308d0..883be9a23f4 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widget.h b/src/widget.h
index b6c5e9f0bcb..21cd4543230 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,6 +1,6 @@
 /* The emacs frame widget public header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widgetprv.h b/src/widgetprv.h
index bde384d3b5f..ac845209ba6 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,6 +1,6 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/window.c b/src/window.c
index 00a2e06bdeb..57a818eeee6 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, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3268,10 +3268,6 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
   struct window *w = XWINDOW (window);
   struct buffer *b = XBUFFER (buffer);
   int count = SPECPDL_INDEX ();
-#ifdef HAVE_WINDOW_SYSTEM
-  struct frame *f = XFRAME (w->frame);
-  Display_Info *dpyinfo;
-#endif
 
   w->buffer = buffer;
 
@@ -3352,15 +3348,6 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
         call1 (Vrun_hooks, Qwindow_configuration_change_hook);
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
-  BLOCK_INPUT;
-  if (f && FRAME_WINDOW_P (f) && FRAME_X_OUTPUT (f)
-      && (dpyinfo = FRAME_X_DISPLAY_INFO (f))
-      && EQ (window, dpyinfo->mouse_face_window))
-    clear_mouse_face (dpyinfo);
-  UNBLOCK_INPUT;
-#endif
-
   unbind_to (count, Qnil);
 }
 
diff --git a/src/window.h b/src/window.h
index 03f416aa9bc..51c0c8a58f6 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,6 +1,6 @@
 /* Window definitions for GNU Emacs.
    Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index a007cd52236..1885735d327 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1,7 +1,7 @@
 /* Display generation from window structure and buffer text.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -13550,6 +13550,7 @@ try_window (window, pos, check_margins)
   struct window *w = XWINDOW (window);
   struct it it;
   struct glyph_row *last_text_row = NULL;
+  struct frame *f = XFRAME (w->frame);
 
   /* Make POS the new window start.  */
   set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos));
diff --git a/src/xfaces.c b/src/xfaces.c
index ec20445b7dc..52252001137 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xfns.c b/src/xfns.c
index 8b4ab0ca363..ec9d54dcf93 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, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xmenu.c b/src/xmenu.c
index b4665f88e07..a30016e2477 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, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xrdb.c b/src/xrdb.c
index 988db614c41..4c9f3c60b35 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, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xselect.c b/src/xselect.c
index 54b20d89d5f..f34b62c8700 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, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 1e4618ed567..7a78a8e60e6 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, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xterm.c b/src/xterm.c
index 122d9b7c3de..5a8d50db072 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
    Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xterm.h b/src/xterm.h
index b8e86d646ed..34583221ad3 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, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.