Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 638-652)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177

50 files changed, 1109 insertions, 271 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 723f8f6b21c..4eed8c4c705 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -977,7 +977,7 @@ Print $ as a lisp object of any type.
 end
 
 define xprintstr
-  set $data = $arg0->data
+  set $data = (char *) $arg0->data
   output ($arg0->size > 1000) ? 0 : ($data[0])@($arg0->size_byte < 0 ? $arg0->size & ~gdb_array_mark_flag : $arg0->size_byte)
 end
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 63d39d7e6dc..a01b3137e95 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,160 @@
+2007-02-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/xtensa.h: New file.
+
+2007-02-24  Nick Roberts  <nickrob@snap.net.nz>
+
+        * .gdbinit (xprintstr): Ensure GDB (> 6.6) prints symbol name
+        as strings and not character arrays.
+
+2007-02-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag)
+        (x_set_toolkit_scroll_bar_thumb): Add bar->min_handle as margin to
+        scroll bar handle size in order to avoid `scroll backward' problem.
+        (x_scroll_bar_create, XTset_vertical_scroll_bar)
+        [USE_TOOLKIT_SCROLL_BARS]: Initialize bar->min_handle.
+
+        * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: New
+        member `min_handle'.
+
+2007-02-23  Kim F. Storm  <storm@cua.dk>
+
+        * print.c (print): Reset print_number_index if Vprint_number_table
+        is nil.
+
+2007-02-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (stat, get_long_basename, is_unc_volume): Use _mbspbrk
+        instead of strpbrk.
+
+2007-02-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (mac_menu_show): Call unbind_to early.  Use variable
+        `menu_item_selection' as in W32 version.
+        [TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Add explicit
+        braces to avoid ambiguous `else'.
+
+        * macterm.c (mac_display_info_for_display): Remove function.
+        (mac_flush_display_optional) [USE_CG_DRAWING]: New function.
+        (x_redisplay_interface) [USE_CG_DRAWING]: Set it as handler for
+        flush_display_optional.
+        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): New
+        argument MOUSE_POS.  All uses changed.  Set bar->dragging to
+        negative integer if scroll bar handle is pressed.
+        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): Negative
+        bar->dragging means scroll bar handle is not dragged.
+        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag): Get initial
+        offset of scroll bar handle from negative bar->dragging.
+        (XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Modifiers for scroll
+        bar click is compared against mapped one.  Set down/up_modifier
+        for scroll bar click event with control key.
+
+        * macterm.h (x_display_info_for_display): Remove extern.
+        (SCROLL_BAR_UNPACK, SET_SCROLL_BAR_CONTROL_HANDLE): Don't limit
+        value to be unpacked to 32-bit on LP64 model.
+
+2007-02-23  Kenichi Handa  <handa@m17n.org>
+
+        * process.c (send_process_object_unwind): New function.
+        (send_process_object): New function.
+        (Fprocess_send_region): Call send_process_object.
+        (Fprocess_send_string): Likewise.
+
+2007-02-22  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (w32_menu_show): Mark the frame's menu as inactive
+        when popup menu finishes.
+
+        * w32fns.c (menubar_in_use): New flag.
+        (w32_wnd_proc) [WM_INITMENU, WM_EXITMENULOOP, WM_TIMER, WM_COMMAND]:
+        Use it.
+
+        * w32menu.c (Fx_popup_menu): Don't free menu strings here.
+        (w32_menu_show): Do it here instead.
+
+        * w32fns.c (w32_wnd_proc) [WM_INITMENU]: Set menubar_active frame
+        parameter.
+
+        * w32menu.c (current_popup_menu): Make available globally.
+        (menubar_selection_callback): Free menu strings before pushing the
+        menu event into the keyboard buffer.  Remove
+        menu_command_in_progress.
+
+        * w32fns.c (current_popup_menu): Use from w32menu.c.
+        (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active
+        and current_popup_menu to determine whether a menubar menu has
+        been cancelled.
+
+        * w32term.h (w32_output): Remove menu_command_in_progress.
+
+2007-02-22  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (update_frame, update_single_window): Set force_p here if
+        redisplay_dont_pause is set or Vredisplay_preemption_period is nil...
+        (update_window, update_frame_1): ... instead of here.
+        (update_text_area): Clear mouse face on header lines.
+
+2007-02-21  Kim F. Storm  <storm@cua.dk>
+
+        * minibuf.c (Fassoc_string): Doc fix.  Allow symbol for KEY too.
+
+2007-02-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (WINDOW_RESOURCE, TERM_WINDOW_RESOURCE): Remove macros.
+        [USE_MAC_TSM] (mac_handle_text_input_event): Remove unused variable
+        `mapped_modifiers'.
+        (XTread_socket) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1020]: Use Keyboard
+        Layout Services routines to get current Unicode keyboard layout.
+
+2007-02-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (x_set_screen_gamma): Apply gamma value to the frame's
+        bgcolor.
+
+2007-02-19  Kim F. Storm  <storm@cua.dk>
+
+        * minibuf.c (Fassoc_string): Allow symbols as keys.
+
+        * w32term.c (w32_set_scroll_bar_thumb): Don't resize scroll-bar
+        handle while dragging, except when we get close to eob.
+        Fix position and size calculations so we don't scroll backwards
+        just by clicking on the handle.
+
+2007-02-17  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * Makefile.in (${emacsapp}Contents/Resources/Emacs.rsrc)
+        [HAVE_CARBON]: Remove target.
+        (macosx-app) [HAVE_CARBON]: Don't depend on it.
+
+2007-02-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * callproc.c (syms_of_callproc) <doc-directory>:
+        <configure-info-directory>:
+        (Fgetenv_internal): Fix typos in docstrings.
+
+        * doc.c (Fsubstitute_command_keys): Fix typo in docstring.
+
+2007-02-16  Andreas Schwab  <schwab@suse.de>
+
+        * frame.c (Fmodify_frame_parameters): Return a value.
+
+        * editfns.c (Fformat): Add support for '+' flag.
+        * doprnt.c (doprnt1): Likewise.  Fix overflow checking.
+
+2007-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * s/umips.h: Unused file removed.
+
+2007-02-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xfaces.c (Fcolor_distance): Don't continue checking a color for
+        errors after it has been correctly parsed as an RGB list.
+
+2007-02-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (do_ewmh_fullscreen): Also check for _NET_WM_STATE_FULLSCREEN.
+
 2007-02-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macfns.c (Fx_focus_frame): Move current process to foreground if
@@ -510,7 +667,7 @@
 
 2006-12-19  Juanma Barranquero  <lekktu@gmail.com>
 
-        * buffer.c (syms_of_buffer) <buffer-display-table>
+        * buffer.c (syms_of_buffer) <buffer-display-table>:
         <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
 
 2006-12-17  Richard Stallman  <rms@gnu.org>
diff --git a/src/Makefile.in b/src/Makefile.in
index ceb9a1d5888..c5e1c18116b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1335,15 +1335,10 @@ macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \
         ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \
         ${emacsapp}Contents/Resources/Emacs.icns \
         ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
-macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \
-  ${emacsapp}Contents/Resources/Emacs.rsrc
+macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs
 ${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT}
         mkdir -p ${emacsapp}Contents/MacOS/;
         cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT}
-${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
-        /Developer/Tools/Rez -useDF \
-        -o ${emacsapp}Contents/Resources/Emacs.rsrc \
-        /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $<
 #endif
 
 ${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c
diff --git a/src/callproc.c b/src/callproc.c
index 6af47f0ed3e..c5e747ff6d2 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1370,7 +1370,7 @@ getenv_internal (var, varlen, value, valuelen)
 DEFUN ("getenv-internal", Fgetenv_internal, Sgetenv_internal, 1, 1, 0,
        doc: /* Return the value of environment variable VAR, as a string.
 VAR should be a string.  Value is nil if VAR is undefined in the environment.
-This function consults the variable ``process-environment'' for its value.  */)
+This function consults the variable `process-environment' for its value.  */)
      (var)
      Lisp_Object var;
 {
@@ -1580,12 +1580,12 @@ These are files intended for Emacs to use while it runs.  */);
 
   DEFVAR_LISP ("doc-directory", &Vdoc_directory,
                doc: /* Directory containing the DOC file that comes with GNU Emacs.
-This is usually the same as data-directory.  */);
+This is usually the same as `data-directory'.  */);
 
   DEFVAR_LISP ("configure-info-directory", &Vconfigure_info_directory,
                doc: /* For internal use by the build procedure only.
 This is the name of the directory in which the build procedure installed
-Emacs's info files; the default value for Info-default-directory-list
+Emacs's info files; the default value for `Info-default-directory-list'
 includes this.  */);
   Vconfigure_info_directory = build_string (PATH_INFO);
 
diff --git a/src/dispnew.c b/src/dispnew.c
index ccda3eca550..97cd210396c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3827,8 +3827,12 @@ update_frame (f, force_p, inhibit_hairy_id_p)
   int paused_p;
   struct window *root_window = XWINDOW (f->root_window);
 
+  if (redisplay_dont_pause)
+    force_p = 1;
 #if PERIODIC_PREEMPTION_CHECKING
-  if (!force_p && NUMBERP (Vredisplay_preemption_period))
+  else if (NILP (Vredisplay_preemption_period))
+    force_p = 1;
+  else if (!force_p && NUMBERP (Vredisplay_preemption_period))
     {
       EMACS_TIME tm;
       double p = XFLOATINT (Vredisplay_preemption_period);
@@ -3982,8 +3986,12 @@ update_single_window (w, force_p)
       /* Record that this is not a frame-based redisplay.  */
       set_frame_matrix_frame (NULL);
 
+      if (redisplay_dont_pause)
+        force_p = 1;
 #if PERIODIC_PREEMPTION_CHECKING
-      if (!force_p && NUMBERP (Vredisplay_preemption_period))
+      else if (NILP (Vredisplay_preemption_period))
+        force_p = 1;
+      else if (!force_p && NUMBERP (Vredisplay_preemption_period))
         {
           EMACS_TIME tm;
           double p = XFLOATINT (Vredisplay_preemption_period);
@@ -4165,13 +4173,8 @@ update_window (w, force_p)
 #endif
 
   /* Check pending input the first time so that we can quickly return.  */
-  if (redisplay_dont_pause)
-    force_p = 1;
-#if PERIODIC_PREEMPTION_CHECKING
-  else if (NILP (Vredisplay_preemption_period))
-    force_p = 1;
-#else
-  else if (!force_p)
+#if !PERIODIC_PREEMPTION_CHECKING
+  if (!force_p)
     detect_input_pending_ignore_squeezables ();
 #endif
 
@@ -4395,8 +4398,10 @@ update_text_area (w, vpos)
          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)
+         line doesn't seem to hurt anything. -- cyd.
+         But it is still needed for the header line. -- kfs.  */
+      || (current_row->mouse_face_p
+          && !(current_row->mode_line_p && vpos > 0))
       || current_row->x != desired_row->x)
     {
       rif->cursor_to (vpos, 0, desired_row->y, desired_row->x);
@@ -5215,13 +5220,8 @@ update_frame_1 (f, force_p, inhibit_id_p)
   if (preempt_count <= 0)
     preempt_count = 1;
 
-  if (redisplay_dont_pause)
-    force_p = 1;
-#if PERIODIC_PREEMPTION_CHECKING
-  else if (NILP (Vredisplay_preemption_period))
-    force_p = 1;
-#else
-  else if (!force_p && detect_input_pending_ignore_squeezables ())
+#if !PERIODIC_PREEMPTION_CHECKING
+  if (!force_p && detect_input_pending_ignore_squeezables ())
     {
       pause = 1;
       goto do_pause;
diff --git a/src/doc.c b/src/doc.c
index df3ca94af1e..74690ebba6b 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -745,7 +745,7 @@ as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
 thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
 
-Returns original STRING if no substitutions were made.  Othwerwise,
+Returns original STRING if no substitutions were made.  Otherwise,
 a new string, without any text properties, is returned.  */)
      (string)
      Lisp_Object string;
diff --git a/src/doprnt.c b/src/doprnt.c
index d3c8557c251..bb8c582ccd2 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -106,7 +106,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
   char tembuf[DBL_MAX_10_EXP + 100];
 
   /* Size of sprintf_buffer.  */
-  int size_allocated = sizeof (tembuf);
+  unsigned size_allocated = sizeof (tembuf);
 
   /* Buffer to use for sprintf.  Either tembuf or same as BIG_BUFFER.  */
   char *sprintf_buffer = tembuf;
@@ -136,12 +136,12 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
     {
       if (*fmt == '%')  /* Check for a '%' character */
         {
-          int size_bound = 0;
+          unsigned size_bound = 0;
           int width;            /* Columns occupied by STRING.  */
 
           fmt++;
           /* Copy this one %-spec into fmtcpy.  */
-          string = (unsigned char *)fmtcpy;
+          string = (unsigned char *) fmtcpy;
           *string++ = '%';
           while (1)
             {
@@ -152,11 +152,11 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                      This might be a field width or a precision; e.g.
                      %1.1000f and %1000.1f both might need 1000+ bytes.
                      Parse the width or precision, checking for overflow.  */
-                  int n = *fmt - '0';
+                  unsigned n = *fmt - '0';
                   while ('0' <= fmt[1] && fmt[1] <= '9')
                     {
                       if (n * 10 / 10 != n
-                          || (n = n * 10 + (fmt[1] - '0')) < 0)
+                          || (n = n * 10 + (fmt[1] - '0')) < n)
                         error ("Format width or precision too large");
                       *string++ = *++fmt;
                     }
@@ -164,7 +164,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                   if (size_bound < n)
                     size_bound = n;
                 }
-              else if (*fmt == '-' || *fmt == ' ' || *fmt == '.')
+              else if (*fmt == '-' || *fmt == ' ' || *fmt == '.' || *fmt == '+')
                 ;
               else
                 break;
@@ -174,10 +174,9 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
 
           /* Make the size bound large enough to handle floating point formats
              with large numbers.  */
-          size_bound += DBL_MAX_10_EXP + 50;
-
-          if (size_bound < 0)
+          if (size_bound + DBL_MAX_10_EXP + 50 < size_bound)
             error ("Format width or precision too large");
+          size_bound += DBL_MAX_10_EXP + 50;
 
           /* Make sure we have that much.  */
           if (size_bound > size_allocated)
@@ -213,7 +212,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                 abort ();
               sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
               /* Now copy into final output, truncating as nec.  */
-              string = (unsigned char *)sprintf_buffer;
+              string = (unsigned char *) sprintf_buffer;
               goto doit;
 
             case 'f':
@@ -227,7 +226,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                 u.half[1] = args[cnt++];
                 sprintf (sprintf_buffer, fmtcpy, u.d);
                 /* Now copy into final output, truncating as nec.  */
-                string = (unsigned char *)sprintf_buffer;
+                string = (unsigned char *) sprintf_buffer;
                 goto doit;
               }
 
@@ -240,13 +239,13 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                 minlen = atoi (&fmtcpy[1]);
               if (lispstrings)
                 {
-                  string = ((struct Lisp_String *)args[cnt])->data;
-                  tem = STRING_BYTES ((struct Lisp_String *)args[cnt]);
+                  string = ((struct Lisp_String *) args[cnt])->data;
+                  tem = STRING_BYTES ((struct Lisp_String *) args[cnt]);
                   cnt++;
                 }
               else
                 {
-                  string = (unsigned char *)args[cnt++];
+                  string = (unsigned char *) args[cnt++];
                   tem = strlen (string);
                 }
               width = strwidth (string, tem);
diff --git a/src/editfns.c b/src/editfns.c
index 3e27ca0cf43..70cfac36fb1 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3528,7 +3528,7 @@ Use %% to put a single % into the output.
 
 The basic structure of a %-sequence is
   % <flags> <width> <precision> character
-where flags is [- #0]+, width is [0-9]+, and precision is .[0-9]+
+where flags is [-+ #0]+, width is [0-9]+, and precision is .[0-9]+
 
 usage: (format STRING &rest OBJECTS)  */)
      (nargs, args)
@@ -3641,7 +3641,7 @@ usage: (format STRING &rest OBJECTS)  */)
 
            where
 
-           flags        ::= [- #0]+
+           flags        ::= [-+ #0]+
            field-width  ::= [0-9]+
            precision    ::= '.' [0-9]*
 
@@ -3655,7 +3655,7 @@ usage: (format STRING &rest OBJECTS)  */)
 
         while (format != end
                && (*format == '-' || *format == '0' || *format == '#'
-                   || * format == ' '))
+                   || * format == ' ' || *format == '+'))
           ++format;
 
         if (*format >= '0' && *format <= '9')
@@ -3832,7 +3832,7 @@ usage: (format STRING &rest OBJECTS)  */)
           discarded[format - format_start] = 1;
           format++;
 
-          while (index("-0# ", *format))
+          while (index("-+0# ", *format))
             {
               if (*format == '-')
                 {
diff --git a/src/frame.c b/src/frame.c
index 5e0ed8175d3..284b04494a8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2331,6 +2331,8 @@ enabled such bindings for that variable with `make-variable-frame-local'.  */)
             call1 (Qframe_set_background_mode, frame);
         }
     }
+
+  return Qnil;
 }
 
 DEFUN ("frame-char-height", Fframe_char_height, Sframe_char_height,
@@ -3068,18 +3070,30 @@ x_set_screen_gamma (f, new_value, old_value)
      struct frame *f;
      Lisp_Object new_value, old_value;
 {
+  Lisp_Object bgcolor;
+
   if (NILP (new_value))
     f->gamma = 0;
   else if (NUMBERP (new_value) && XFLOATINT (new_value) > 0)
-    {
-      Fclear_face_cache (Qnil);
-      /* The value 0.4545 is the normal viewing gamma.  */
-      f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value));
-    }
+    /* The value 0.4545 is the normal viewing gamma.  */
+    f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value));
   else
     signal_error ("Invalid screen-gamma", new_value);
 
-  clear_face_cache (0);
+  /* Apply the new gamma value to the frame background.  */
+  bgcolor = Fassq (Qbackground_color, f->param_alist);
+  if (CONSP (bgcolor) && (bgcolor = XCDR (bgcolor), STRINGP (bgcolor)))
+    {
+      Lisp_Object index = Fget (Qbackground_color, Qx_frame_parameter);
+      if (NATNUMP (index)
+          && (XFASTINT (index)
+              < sizeof (frame_parms)/sizeof (frame_parms[0]))
+          && rif->frame_parm_handlers[XFASTINT (index)])
+        (*(rif->frame_parm_handlers[XFASTINT (index)]))
+          (f, bgcolor, Qnil);
+    }
+
+  Fclear_face_cache (Qnil);
 }
 
 
diff --git a/src/gnu.h b/src/gnu.h
index dbf47317493..953546e611a 100644
--- a/src/gnu.h
+++ b/src/gnu.h
@@ -1,3 +1,32 @@
+/* XPM */
+/* Emacs "E" icon
+
+Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
+
+Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
+
+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.
+
+Commentary:
+
+This is a version of one of the GNU Emacs icon set posted to
+emacs-devel in October 2005 by Andrew Zhilin.
+*/
 #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
 static char * gnu_xpm_bits[] = {
 "32 32 173 2",
diff --git a/src/m/mips4.h b/src/m/mips4.h
index 4b79e466fb3..06db7d5dff0 100644
--- a/src/m/mips4.h
+++ b/src/m/mips4.h
@@ -1,4 +1,25 @@
-/* machine description file for Mips running RISCOS version 4.  */
+/* machine description file for Mips running RISCOS version 4.
+
+   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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 1, 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.  */
+
 
 #include "mips.h"
 
diff --git a/src/m/news-risc.h b/src/m/news-risc.h
index 2ecaff41cb9..07e055dac9a 100644
--- a/src/m/news-risc.h
+++ b/src/m/news-risc.h
@@ -1,4 +1,25 @@
-/* news-risc.h is for the "RISC News".  */
+/* news-risc.h is for the "RISC News".
+
+   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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 1, 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.  */
+
 
 #include "mips.h"
 
diff --git a/src/m/pmax.h b/src/m/pmax.h
index c83c514ab98..1f2869a09d3 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -1,4 +1,25 @@
-/* Machine description file for DEC MIPS machines.  */
+/* Machine description file for DEC MIPS machines.
+
+   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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.  */
+
 
 #include "mips.h"
 
diff --git a/src/m/xtensa.h b/src/m/xtensa.h
new file mode 100644
index 00000000000..c5039e1a8a1
--- /dev/null
+++ b/src/m/xtensa.h
@@ -0,0 +1,31 @@
+/* Machine description file for Tensilica Xtensa.
+   Copyright (C) 2007 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 1, 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.  */
+
+#define NO_ARG_ARRAY
+#define NO_UNION_TYPE
+
+#ifdef __LITTLE_ENDIAN
+#undef WORDS_BIG_ENDIAN
+#else
+#define WORDS_BIG_ENDIAN
+#endif
+
+/* arch-tag: fe5872de-d565-4d81-8fe0-ea19865b3e6a
+   (do not change this comment) */
diff --git a/src/macmenu.c b/src/macmenu.c
index 3ea09412650..82322515c31 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -2012,9 +2012,8 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
      char **error;
 {
   int i;
-  UInt32 refcon;
   int menu_item_choice;
-  int menu_item_selection;
+  UInt32 menu_item_selection;
   MenuHandle menu;
   Point pos;
   widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;
@@ -2229,7 +2228,6 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   LocalToGlobal (&pos);
 
   /* No selection has been chosen yet.  */
-  menu_item_choice = 0;
   menu_item_selection = 0;
 
   record_unwind_protect (pop_down_menu, make_save_value (f, 0));
@@ -2240,20 +2238,18 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 
   /* Display the menu.  */
   menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0);
-  menu_item_selection = LoWord (menu_item_choice);
 
   /* Get the refcon to find the correct item */
-  if (menu_item_selection)
+  if (menu_item_choice)
     {
       MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
-      if (sel_menu) {
-        GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
-      }
+
+      if (sel_menu)
+        GetMenuItemRefCon (sel_menu, LoWord (menu_item_choice),
+                           &menu_item_selection);
     }
-  else if (! for_click)
-    /* Make "Cancel" equivalent to C-g unless this menu was popped up by
-       a mouse press.  */
-    Fsignal (Qquit, Qnil);
+
+  unbind_to (specpdl_count, Qnil);
 
   /* Find the selected item, and its pane, to return
      the proper value.  */
@@ -2290,7 +2286,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
             {
               entry
                 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];
-              if ((int) (EMACS_INT) refcon == i)
+              if (menu_item_selection == i)
                 {
                   if (keymaps != 0)
                     {
@@ -2313,8 +2309,6 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
     /* Make "Cancel" equivalent to C-g.  */
     Fsignal (Qquit, Qnil);
 
-  unbind_to (specpdl_count, Qnil);
-
   return Qnil;
 }
 
@@ -2386,10 +2380,12 @@ mac_handle_dialog_event (next_handler, event, data)
                                            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;
+                  {
+                    if (mac_quit_char_key_p (modifiers, key_code))
+                      err = QuitAppModalLoopForWindow (window);
+                    else
+                      err = eventNotHandledErr;
+                  }
               }
               break;
             }
diff --git a/src/macterm.c b/src/macterm.c
index 7ea0d1138e2..3a403c39c26 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1918,18 +1918,16 @@ x_flush (f)
 
 #define XFlush(DISPLAY) (void) 0
 
-
-/* Return the struct mac_display_info corresponding to DPY.  There's
-   only one.  */
-
-struct mac_display_info *
-mac_display_info_for_display (dpy)
-     Display *dpy;
+#if USE_CG_DRAWING
+static void
+mac_flush_display_optional (f)
+     struct frame *f;
 {
-  return &one_mac_display_info;
+  BLOCK_INPUT;
+  mac_prepare_for_quickdraw (f);
+  UNBLOCK_INPUT;
 }
-
-
+#endif
 
 /***********************************************************************
                     Starting and ending an update
@@ -4651,7 +4649,7 @@ static void construct_scroll_bar_click P_ ((struct scroll_bar *, int,
 static OSStatus get_control_part_bounds P_ ((ControlHandle, ControlPartCode,
                                              Rect *));
 static void x_scroll_bar_handle_press P_ ((struct scroll_bar *,
-                                           ControlPartCode,
+                                           ControlPartCode, Point,
                                            struct input_event *));
 static void x_scroll_bar_handle_release P_ ((struct scroll_bar *,
                                              struct input_event *));
@@ -4764,9 +4762,10 @@ get_control_part_bounds (ch, part_code, rect)
 }
 
 static void
-x_scroll_bar_handle_press (bar, part_code, bufp)
+x_scroll_bar_handle_press (bar, part_code, mouse_pos, bufp)
      struct scroll_bar *bar;
      ControlPartCode part_code;
+     Point mouse_pos;
      struct input_event *bufp;
 {
   int part = control_part_code_to_scroll_bar_part (part_code);
@@ -4779,10 +4778,18 @@ x_scroll_bar_handle_press (bar, part_code, bufp)
       construct_scroll_bar_click (bar, part, bufp);
       HiliteControl (SCROLL_BAR_CONTROL_HANDLE (bar), part_code);
       set_scroll_bar_timer (SCROLL_BAR_FIRST_DELAY);
+      bar->dragging = Qnil;
+    }
+  else
+    {
+      Rect r;
+
+      get_control_part_bounds (SCROLL_BAR_CONTROL_HANDLE (bar),
+                               kControlIndicatorPart, &r);
+      XSETINT (bar->dragging, - (mouse_pos.v - r.top) - 1);
     }
 
   last_scroll_bar_part = part;
-  bar->dragging = Qnil;
   tracked_scroll_bar = bar;
 }
 
@@ -4792,7 +4799,7 @@ x_scroll_bar_handle_release (bar, bufp)
      struct input_event *bufp;
 {
   if (last_scroll_bar_part != scroll_bar_handle
-      || !GC_NILP (bar->dragging))
+      || (INTEGERP (bar->dragging) && XINT (bar->dragging) >= 0))
     construct_scroll_bar_click (bar, scroll_bar_end_scroll, bufp);
 
   HiliteControl (SCROLL_BAR_CONTROL_HANDLE (bar), 0);
@@ -4820,13 +4827,11 @@ x_scroll_bar_handle_drag (win, bar, mouse_pos, bufp)
       get_control_part_bounds (SCROLL_BAR_CONTROL_HANDLE (bar),
                                kControlIndicatorPart, &r);
 
-      if (GC_NILP (bar->dragging))
-        XSETINT (bar->dragging, mouse_pos.v - r.top);
+      if (INTEGERP (bar->dragging) && XINT (bar->dragging) < 0)
+        XSETINT (bar->dragging, - (XINT (bar->dragging) + 1));
 
       top = mouse_pos.v - XINT (bar->dragging) - XINT (bar->track_top);
-      top_range = (XINT (bar->track_height) - (r.bottom - r.top)) *
-        (1.0 + (float) GetControlViewSize (ch) / GetControl32BitMaximum (ch))
-        + .5;
+      top_range = XINT (bar->track_height) - XINT (bar->min_handle);
 
       if (top < 0)
         top = 0;
@@ -4893,13 +4898,16 @@ x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
   if (XINT (bar->track_height) == 0)
     return;
 
-  if (whole == 0)
+  if (whole <= portion)
     value = 0, viewsize = 1, maximum = 0;
   else
     {
-      value = position;
-      viewsize = portion;
-      maximum = max (0, whole - portion);
+      float scale;
+
+      maximum = XINT (bar->track_height) - XINT (bar->min_handle);
+      scale = (float) maximum / (whole - portion);
+      value = position * scale + 0.5f;
+      viewsize = (int) (portion * scale + 0.5f) + XINT (bar->min_handle);
     }
 
   BLOCK_INPUT;
@@ -4980,6 +4988,7 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
 #ifdef USE_TOOLKIT_SCROLL_BARS
   bar->track_top = Qnil;
   bar->track_height = Qnil;
+  bar->min_handle = Qnil;
 #endif
 
   /* Add bar to its frame's list of scroll bars.  */
@@ -5200,6 +5209,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 #ifdef USE_TOOLKIT_SCROLL_BARS
           bar->track_top = Qnil;
           bar->track_height = Qnil;
+          bar->min_handle = Qnil;
 #endif
         }
 
@@ -5213,6 +5223,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
         {
           XSETINT (bar->track_top, 0);
           XSETINT (bar->track_height, 0);
+          XSETINT (bar->min_handle, 0);
         }
       else
         {
@@ -5222,7 +5233,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
           BLOCK_INPUT;
 
           SetControl32BitMinimum (ch, 0);
-          SetControl32BitMaximum (ch, 1);
+          SetControl32BitMaximum (ch, 1 << 30);
           SetControlViewSize (ch, 1);
 
           /* Move the scroll bar thumb to the top.  */
@@ -5230,12 +5241,13 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
           get_control_part_bounds (ch, kControlIndicatorPart, &r0);
 
           /* Move the scroll bar thumb to the bottom.  */
-          SetControl32BitValue (ch, 1);
+          SetControl32BitValue (ch, 1 << 30);
           get_control_part_bounds (ch, kControlIndicatorPart, &r1);
 
           UnionRect (&r0, &r1, &r0);
           XSETINT (bar->track_top, r0.top);
           XSETINT (bar->track_height, r0.bottom - r0.top);
+          XSETINT (bar->min_handle, r1.bottom - r1.top);
 
           /* Don't show the scroll bar if its height is not enough to
              display the scroll bar thumb.  */
@@ -8812,9 +8824,6 @@ mac_set_font_info_for_selection (f, face_id, c)
 #define M_APPLE 234
 #define I_ABOUT 1
 
-#define WINDOW_RESOURCE 128
-#define TERM_WINDOW_RESOURCE 129
-
 #define DEFAULT_NUM_COLS 80
 
 #define MIN_DOC_SIZE 64
@@ -10141,7 +10150,7 @@ mac_handle_text_input_event (next_handler, event, data)
     case kEventTextInputUnicodeForKeyEvent:
       {
         EventRef kbd_event;
-        UInt32 actual_size, modifiers, mapped_modifiers;
+        UInt32 actual_size, modifiers;
 
         err = GetEventParameter (event, kEventParamTextInputSendKeyboardEvent,
                                  typeEventRef, NULL, sizeof (EventRef), NULL,
@@ -10754,12 +10763,12 @@ XTread_socket (sd, expected, hold_quit)
 #ifdef USE_TOOLKIT_SCROLL_BARS
                         /* Make the "Ctrl-Mouse-2 splits window" work
                            for toolkit scroll bars.  */
-                        if (er.modifiers & controlKey)
+                        if (inev.modifiers & ctrl_modifier)
                           x_scroll_bar_handle_click (bar, control_part_code,
                                                      &er, &inev);
                         else if (er.what == mouseDown)
                           x_scroll_bar_handle_press (bar, control_part_code,
-                                                     &inev);
+                                                     mouse_loc, &inev);
                         else
                           x_scroll_bar_handle_release (bar, &inev);
 #else  /* not USE_TOOLKIT_SCROLL_BARS */
@@ -10822,7 +10831,9 @@ XTread_socket (sd, expected, hold_quit)
                       f->mouse_moved = 0;
 
 #ifdef USE_TOOLKIT_SCROLL_BARS
-                    if (inev.kind == MOUSE_CLICK_EVENT)
+                    if (inev.kind == MOUSE_CLICK_EVENT
+                        || (inev.kind == SCROLL_BAR_CLICK_EVENT
+                            && (inev.modifiers & ctrl_modifier)))
 #endif
                       switch (er.what)
                         {
@@ -11162,6 +11173,16 @@ XTread_socket (sd, expected, hold_quit)
                 /* translate the keycode back to determine the
                    original key */
 #ifdef MAC_OSX
+                UCKeyboardLayout *uchr_ptr = NULL;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
+                OSStatus err;
+                KeyboardLayoutRef layout;
+
+                err = KLGetCurrentKeyboardLayout (&layout);
+                if (err == noErr)
+                  KLGetKeyboardLayoutProperty (layout, kKLuchrData,
+                                               (const void **) &uchr_ptr);
+#else
                 static SInt16 last_key_layout_id = 0;
                 static Handle uchr_handle = (Handle)-1;
                 SInt16 current_key_layout_id =
@@ -11173,8 +11194,11 @@ XTread_socket (sd, expected, hold_quit)
                     uchr_handle = GetResource ('uchr', current_key_layout_id);
                     last_key_layout_id = current_key_layout_id;
                   }
-
                 if (uchr_handle)
+                  uchr_ptr = (UCKeyboardLayout *)*uchr_handle;
+#endif
+
+                if (uchr_ptr)
                   {
                     OSStatus status;
                     UInt16 key_action = er.what - keyDown;
@@ -11185,7 +11209,7 @@ XTread_socket (sd, expected, hold_quit)
                     UniChar code;
                     UniCharCount actual_length;
 
-                    status = UCKeyTranslate ((UCKeyboardLayout *)*uchr_handle,
+                    status = UCKeyTranslate (uchr_ptr,
                                              keycode, key_action,
                                              modifier_key_state,
                                              keyboard_type,
@@ -11701,7 +11725,11 @@ static struct redisplay_interface x_redisplay_interface =
   x_update_window_end,
   x_cursor_to,
   x_flush,
+#if USE_CG_DRAWING
+  mac_flush_display_optional,
+#else
   0, /* flush_display_optional */
+#endif
   x_clear_window_mouse_face,
   x_get_glyph_overhangs,
   x_fix_overlapping_area,
diff --git a/src/macterm.h b/src/macterm.h
index 0447b41d908..3d0b41f6efe 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -204,7 +204,6 @@ extern struct mac_display_info one_mac_display_info;
    FONT-LIST-CACHE records previous values returned by x-list-fonts.  */
 extern Lisp_Object x_display_name_list;
 
-extern struct x_display_info *x_display_info_for_display P_ ((Display *));
 extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));
 
 extern struct mac_display_info *mac_term_init P_ ((Lisp_Object, char *, char *));
@@ -404,8 +403,8 @@ struct scroll_bar {
   /* The next and previous in the chain of scroll bars in this frame.  */
   Lisp_Object next, prev;
 
-  /* The Mac control handle of this scroll bar.  Since this is a full
-     32-bit quantity, we store it split into two 32-bit values.  */
+  /* The Mac control handle of this scroll bar.  Since this is a
+     pointer value, we store it split into two Lisp integers.  */
   Lisp_Object control_handle_low, control_handle_high;
 
   /* The position and size of the scroll bar in pixels, relative to the
@@ -427,7 +426,9 @@ struct scroll_bar {
 
   /* If the scroll bar handle is currently being dragged by the user,
      this is the number of pixels from the top of the handle to the
-     place where the user grabbed it.  If the handle isn't currently
+     place where the user grabbed it.  If the handle is pressed but
+     not dragged yet, this is a negative integer whose absolute value
+     is the number of pixels plus 1.  If the handle isn't currently
      being dragged, this is Qnil.  */
   Lisp_Object dragging;
 
@@ -435,6 +436,9 @@ struct scroll_bar {
   /* The position and size of the scroll bar handle track area in
      pixels, relative to the frame.  */
   Lisp_Object track_top, track_height;
+
+  /* Minimum length of the scroll bar handle, in pixels.  */
+  Lisp_Object min_handle;
 #endif
 };
 
@@ -448,13 +452,13 @@ struct scroll_bar {
 #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec))
 
 
-/* Building a 32-bit C integer from two 16-bit lisp integers.  */
+/* Building a C long integer from two lisp integers.  */
 #define SCROLL_BAR_PACK(low, high) (XINT (high) << 16 | XINT (low))
 
-/* Setting two lisp integers to the low and high words of a 32-bit C int.  */
-#define SCROLL_BAR_UNPACK(low, high, int32) \
-  (XSETINT ((low),   (int32)        & 0xffff), \
-   XSETINT ((high), ((int32) >> 16) & 0xffff))
+/* Setting two lisp integers to two parts of a C unsigned long.  */
+#define SCROLL_BAR_UNPACK(low, high, ulong) \
+  (XSETINT ((low),  (ulong) & 0xffff), \
+   XSETINT ((high), (ulong) >> 16))
 
 
 /* Extract the Mac control handle of the scroll bar from a struct
@@ -464,9 +468,9 @@ struct scroll_bar {
                                     (ptr)->control_handle_high))
 
 /* Store a Mac control handle in a struct scroll_bar.  */
-#define SET_SCROLL_BAR_CONTROL_HANDLE(ptr, id) \
+#define SET_SCROLL_BAR_CONTROL_HANDLE(ptr, handle) \
   (SCROLL_BAR_UNPACK ((ptr)->control_handle_low, \
-                      (ptr)->control_handle_high, (int) id))
+                      (ptr)->control_handle_high, (unsigned long) (handle)))
 
 /* Return the inside width of a vertical scroll bar, given the outside
    width.  */
diff --git a/src/minibuf.c b/src/minibuf.c
index c92bb5e4616..14f5eac846a 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2073,9 +2073,10 @@ do_completion ()
 /* Like assoc but assumes KEY is a string, and ignores case if appropriate.  */
 
 DEFUN ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0,
-       doc: /* Like `assoc' but specifically for strings.
-Unibyte strings are converted to multibyte for comparison.
-And case is ignored if CASE-FOLD is non-nil.
+       doc: /* Like `assoc' but specifically for strings (and symbols).
+Symbols are converted to strings, and unibyte strings are converted to
+multibyte for comparison.
+Case is ignored if optional arg CASE-FOLD is non-nil.
 As opposed to `assoc', it will also match an entry consisting of a single
 string rather than a cons cell whose car is a string.  */)
        (key, list, case_fold)
@@ -2084,12 +2085,17 @@ string rather than a cons cell whose car is a string.  */)
 {
   register Lisp_Object tail;
 
+  if (SYMBOLP (key))
+    key = Fsymbol_name (key);
+
   for (tail = list; !NILP (tail); tail = Fcdr (tail))
     {
       register Lisp_Object elt, tem, thiscar;
       elt = Fcar (tail);
       thiscar = CONSP (elt) ? XCAR (elt) : elt;
-      if (!STRINGP (thiscar))
+      if (SYMBOLP (thiscar))
+        thiscar = Fsymbol_name (thiscar);
+      else if (!STRINGP (thiscar))
         continue;
       tem = Fcompare_strings (thiscar, make_number (0), Qnil,
                               key, make_number (0), Qnil,
diff --git a/src/print.c b/src/print.c
index 0fef9cb9880..709945494e3 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1292,7 +1292,8 @@ print (obj, printcharfun, escapeflag)
      the variable Vprint_continuous_numbering is nil.  Otherwise,
      the values of these variables will be kept between several
      print functions.  */
-  if (NILP (Vprint_continuous_numbering))
+  if (NILP (Vprint_continuous_numbering)
+      || NILP (Vprint_number_table))
     {
       print_number_index = 0;
       Vprint_number_table = Qnil;
diff --git a/src/process.c b/src/process.c
index 4611ce2c05c..27dc9f19e56 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5641,6 +5641,83 @@ send_process (proc, buf, len, object)
   UNGCPRO;
 }
 
+static Lisp_Object
+send_process_object_unwind (buf)
+     Lisp_Object buf;
+{
+  Lisp_Object tembuf;
+
+  if (XBUFFER (buf) == current_buffer)
+    return Qnil;
+  tembuf = Fcurrent_buffer ();
+  Fset_buffer (buf);
+  Fkill_buffer (tembuf);
+  return Qnil;
+}
+
+/* Send current contents of region between START and END to PROC.
+   If START is a string, send it instead.
+   This function can evaluate Lisp code and can garbage collect.  */
+
+static void
+send_process_object (proc, start, end)
+     Lisp_Object proc, start, end;
+{
+  int count = SPECPDL_INDEX ();
+  Lisp_Object object = STRINGP (start) ? start : Fcurrent_buffer ();
+  struct buffer *given_buffer = current_buffer;
+  unsigned char *buf;
+  int len;
+
+  record_unwind_protect (send_process_object_unwind, Fcurrent_buffer ());
+
+  if (STRINGP (object) ? STRING_MULTIBYTE (object)
+      : ! NILP (XBUFFER (object)->enable_multibyte_characters))
+    {
+      struct Lisp_Process *p = XPROCESS (proc);
+      struct coding_system *coding = proc_encode_coding_system[XINT (p->outfd)];
+
+      if (! EQ (coding->symbol, p->encode_coding_system))
+        /* The coding system for encoding was changed to raw-text
+           because we sent a unibyte text previously.  Now we are
+           sending a multibyte text, thus we must encode it by the
+           original coding system specified for the current process.  */
+        setup_coding_system (p->encode_coding_system, coding);
+      if (! NILP (coding->pre_write_conversion))
+        {
+          struct gcpro gcpro1, gcpro2;
+
+          GCPRO2 (proc, object);
+          call2 (coding->pre_write_conversion, start, end);
+          UNGCPRO;
+          if (given_buffer != current_buffer)
+            {
+              start = make_number (BEGV), end = make_number (ZV);
+              object = Fcurrent_buffer ();
+            }
+        }
+    }
+
+  if (BUFFERP (object))
+    {
+      EMACS_INT start_byte;
+
+      if (XINT (start) < GPT && XINT (end) > GPT)
+        move_gap (XINT (end));
+      start_byte = CHAR_TO_BYTE (XINT (start));
+      buf = BYTE_POS_ADDR (start_byte);
+      len = CHAR_TO_BYTE (XINT (end)) - start_byte;
+    }
+  else
+    {
+      buf = SDATA (object);
+      len = SBYTES (object);
+    }
+  send_process (proc, buf, len, object);
+
+  unbind_to (count, Qnil);
+}
+
 DEFUN ("process-send-region", Fprocess_send_region, Sprocess_send_region,
        3, 3, 0,
        doc: /* Send current contents of region as input to PROCESS.
@@ -5654,19 +5731,10 @@ Output from processes can arrive in between bunches.  */)
      Lisp_Object process, start, end;
 {
   Lisp_Object proc;
-  int start1, end1;
 
   proc = get_process (process);
   validate_region (&start, &end);
-
-  if (XINT (start) < GPT && XINT (end) > GPT)
-    move_gap (XINT (start));
-
-  start1 = CHAR_TO_BYTE (XINT (start));
-  end1 = CHAR_TO_BYTE (XINT (end));
-  send_process (proc, BYTE_POS_ADDR (start1), end1 - start1,
-                Fcurrent_buffer ());
-
+  send_process_object (proc, start, end);
   return Qnil;
 }
 
@@ -5684,8 +5752,7 @@ Output from processes can arrive in between bunches.  */)
   Lisp_Object proc;
   CHECK_STRING (string);
   proc = get_process (process);
-  send_process (proc, SDATA (string),
-                SBYTES (string), string);
+  send_process_object (proc, string, Qnil);
   return Qnil;
 }
 
diff --git a/src/s/aix3-2.h b/src/s/aix3-2.h
index 6dfbe5d751c..e745b8dc81b 100644
--- a/src/s/aix3-2.h
+++ b/src/s/aix3-2.h
@@ -1,4 +1,25 @@
-/* s- file for building Emacs on AIX 3.2.  */
+/* s- file for building Emacs on AIX 3.2.
+
+   Copyright (C) 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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.  */
+
 
 #include "aix3-1.h"
 
diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h
index 21d05cb154d..49d866a7d7b 100644
--- a/src/s/aix4-1.h
+++ b/src/s/aix4-1.h
@@ -1,3 +1,25 @@
+/*
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  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.  */
+
+
 #define AIX4_1
 
 #include "aix4.h"
diff --git a/src/s/bsd386.h b/src/s/bsd386.h
index 30833b5ff9a..a3d0983ca25 100644
--- a/src/s/bsd386.h
+++ b/src/s/bsd386.h
@@ -1,4 +1,25 @@
-/* s/ file for bsd386 system.  */
+/* s/ file for bsd386 system.
+
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
 
 #include "bsd4-3.h"
 
diff --git a/src/s/hiuxmpp.h b/src/s/hiuxmpp.h
index 04e0bd4f72c..7e05b2e8ca0 100644
--- a/src/s/hiuxmpp.h
+++ b/src/s/hiuxmpp.h
@@ -1,4 +1,25 @@
-/* System description file for HI-UX.  */
+/* System description file for HI-UX.
+
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  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.  */
+
 
 #define BSD 198911   /* system version (year & month) */
 #define DBL_DIG 15   /* same as the definition of <float.h> */
diff --git a/src/s/hiuxwe2.h b/src/s/hiuxwe2.h
index 004ddd95043..68973d19cd3 100644
--- a/src/s/hiuxwe2.h
+++ b/src/s/hiuxwe2.h
@@ -1,4 +1,25 @@
-/* System description file for HI-UX.  */
+/* System description file for HI-UX.
+
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
 
 #define BSD 198911   /* system version (year & month) */
 #define DBL_DIG 15   /* same as the definition of <float.h> */
diff --git a/src/s/hpux10.h b/src/s/hpux10.h
index 3612cfe0027..8f9e87a67a1 100644
--- a/src/s/hpux10.h
+++ b/src/s/hpux10.h
@@ -1,3 +1,25 @@
+/*
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
+
 #include "hpux9shr.h"
 
 #define HPUX10
diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index e73c630e825..d8d1bd368bb 100644
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -1,8 +1,31 @@
 /* system description file for hpux version 8.
-   This contains changes that were suggested "for the hp700".
-   They were not needed for the 800.
-   Our conjecture that they are needed for hpux version 8,
-   which is what runs on the 700.  */
+
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.
+
+Commentary:
+
+This contains changes that were suggested "for the hp700".
+They were not needed for the 800.
+Our conjecture that they are needed for hpux version 8,
+which is what runs on the 700.  */
 
 #define HPUX8
 
diff --git a/src/s/hpux9.h b/src/s/hpux9.h
index 7562c6ae7ef..d34c56c345b 100644
--- a/src/s/hpux9.h
+++ b/src/s/hpux9.h
@@ -1,4 +1,25 @@
-/* System description file for hpux version 9.  */
+/* System description file for hpux version 9.
+
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
 
 #include "hpux8.h"
 
diff --git a/src/s/irix4-0.h b/src/s/irix4-0.h
index 215cbdc32de..6fbe2478966 100644
--- a/src/s/irix4-0.h
+++ b/src/s/irix4-0.h
@@ -1,3 +1,26 @@
+/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 4.0
+
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
+
 #include "irix3-3.h"
 
 #define USG5_3
diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
index 91017fb56d2..a932e315784 100644
--- a/src/s/irix5-0.h
+++ b/src/s/irix5-0.h
@@ -1,3 +1,26 @@
+/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 5.0.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
+
 #include "usg5-4.h"
 
 #define IRIX5
diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
index e60120d3f6a..bc24474ba73 100644
--- a/src/s/irix6-0.h
+++ b/src/s/irix6-0.h
@@ -1,3 +1,26 @@
+/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.0.
+
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
+
 #include "irix5-0.h"
 
 /* Irix 6 tries to do 64 bits, but doesn't do it fully,
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 9df3e0a2ef6..9a53e16257e 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -1,3 +1,26 @@
+/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.5.
+
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
+
 #define IRIX6_5                 /* used in m/iris4d */
 #include "irix5-0.h"
 
diff --git a/src/s/isc2-2.h b/src/s/isc2-2.h
index 88f216b77d8..3d456570709 100644
--- a/src/s/isc2-2.h
+++ b/src/s/isc2-2.h
@@ -1,5 +1,25 @@
-/* system description file for Interactive (ISC) Unix version 2.2 on
-   the 386.  */
+/* system description file for Interactive (ISC) Unix version 2.2 on the 386.
+
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
 
 #include "usg5-3.h"
 
diff --git a/src/s/isc3-0.h b/src/s/isc3-0.h
index bbd4e8609d1..6b7d20a37d0 100644
--- a/src/s/isc3-0.h
+++ b/src/s/isc3-0.h
@@ -1,4 +1,25 @@
-/* s- file for Interactive (ISC) Unix version 3.0 on the 386.  */
+/* s- file for Interactive (ISC) Unix version 3.0 on the 386.
+
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
 
 #include "isc2-2.h"
 
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index c4bfddfbe5b..5fab025ae2a 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -1,4 +1,25 @@
-/* s/ file for netbsd system.  */
+/* s/ file for netbsd system.
+
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
 
 /* Get most of the stuff from bsd4.3 */
 #include "bsd4-3.h"
diff --git a/src/s/osf1.h b/src/s/osf1.h
index 61ac04c5f1f..04670b3d9a5 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -1,3 +1,25 @@
+/* Definitions file for GNU Emacs running on osf1.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
+
 #include "bsd4-3.h"
 
 /* Identify OSF1 for the m- files. */
diff --git a/src/s/ptx4.h b/src/s/ptx4.h
index 295cb27d1a3..af59d399664 100644
--- a/src/s/ptx4.h
+++ b/src/s/ptx4.h
@@ -1,4 +1,25 @@
-/* s/ file for Sequent "ptx 4", which is a modified SVR5.4.  */
+/* s/ file for Sequent "ptx 4", which is a modified SVR5.4.
+
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
 
 /* Tell usg5-4.h not to include filio.h.  */
 #define NO_FILIO_H
diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index b45ec57ef1f..08964d733e2 100644
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -1,3 +1,26 @@
+/* Definitions file for GNU Emacs running on Solaris 2.3.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
+
 #include "sol2.h"
 
 /* Solaris 2.3 has a bug in XListFontsWithInfo.  */
diff --git a/src/s/sol2.h b/src/s/sol2.h
index 5f7d781f3e3..711d12123a3 100644
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -1,3 +1,25 @@
+/*
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
+
 #include "usg5-4.h"
 
 #define SOLARIS2
diff --git a/src/s/sunos4-0.h b/src/s/sunos4-0.h
index d108df68640..a107b609a0c 100644
--- a/src/s/sunos4-0.h
+++ b/src/s/sunos4-0.h
@@ -1,3 +1,26 @@
+/* Definitions file for GNU Emacs running on sunos 4.0.
+
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
+
 #include "bsd4-2.h"
 
 #ifndef SUNOS4
diff --git a/src/s/sunos4shr.h b/src/s/sunos4shr.h
index 8427201cda3..aac3340a029 100644
--- a/src/s/sunos4shr.h
+++ b/src/s/sunos4shr.h
@@ -1,3 +1,25 @@
+/*
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  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.  */
+
+
 /* This file permits building Emacs with a shared libc on Sunos 4.
    To make this work, you must completely replace your C shared library
    using one of the SunOS 4.1.x jumbo replacement patches from Sun.
diff --git a/src/s/umips.h b/src/s/umips.h
deleted file mode 100644
index 3d497892c4b..00000000000
--- a/src/s/umips.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Definitions file for GNU Emacs running on Mips operating system.
-   That system can emulate either BSD or Sys V, in either case with changes.
-   If BSD_SYSTEM is defined, we assume BSD is being emulated; otherwise,
-   Sys V.  */
-
-#ifdef BSD_SYSTEM
-#include "bsd4-3.h"
-
-#define C_SWITCH_SYSTEM -systype bsd43
-#define LD_SWITCH_SYSTEM -systype bsd43
-#define LIBS_SYSTEM -lmld
-#define LIBS_DEBUG
-#define START_FILES pre-crt0.o /lib/crt1.o
-#define LIB_STANDARD -lc /usr/lib/crtn.o
-
-#define COFF
-#define TERMINFO
-#undef MAIL_USE_FLOCK  /* Someone should check this.  */
-#undef HAVE_UNION_WAIT
-
-#else /* not BSD_SYSTEM */
-
-#include "usg5-2-2.h"
-
-#define LIBS_SYSTEM -lmld
-#define LIBS_DEBUG
-#define START_FILES pre-crt0.o /usr/lib/crt1.o
-#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o
-/* #define LIBS_TERMCAP -lcurses */
-
-#define C_SWITCH_SYSTEM -I/usr/include/bsd
-
-/* Cancel certain parts of standard sysV support.  */
-#undef NONSYSTEM_DIR_LIBRARY
-#define SYSV_SYSTEM_DIR
-#undef static
-
-/* Don't try to use SIGIO or FIONREAD even though they are defined.  */
-#define BROKEN_SIGIO
-#define BROKEN_FIONREAD
-
-/* Describe special kernel features.  */
-
-#define HAVE_SYSVIPC
-
-#if defined(emacs)
-#include <bsd/sys/time.h>
-#endif
-
-/* The `select' in the system won't work for pipes,
-   so don't use it.  */
-#define BROKEN_SELECT
-
-#define HAVE_DUP2
-
-#define HAVE_PTYS
-#define HAVE_SOCKETS
-/* #define BSTRING   Supposedly removed.  */
-
-#undef NOMULTIPLEJOBS
-
-#define CLASH_DETECTION
-
-#define utimes utime  /* Someone should check this.  */
-/* ??? */
-#define IRIS
-
-#endif /* not BSD_SYSTEM */
-
-/* High order bit must be stripped off nlist return values */
-#define FIXUP_KERNEL_SYMBOL_ADDR(NL)  (NL)[0].n_value &= 0x7fffffff;
-
-/* arch-tag: 9b816c7d-6ee2-40d9-b6dc-42c0aeccfbec
-   (do not change this comment) */
diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h
index 8b11bc54eae..56b2a345814 100644
--- a/src/s/usg5-4-2.h
+++ b/src/s/usg5-4-2.h
@@ -1,4 +1,25 @@
-/* s/ file for System V release 4.2.  */
+/* s/ file for System V release 4.2.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  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.  */
+
 
 #include "usg5-4.h"
 
diff --git a/src/w32.c b/src/w32.c
index 87ae9d9f8fd..9ad82c7a231 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -32,6 +32,7 @@ Boston, MA 02110-1301, USA.
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/utime.h>
+#include <mbstring.h>   /* for _mbspbrk */
 
 /* must include CRT headers *before* config.h */
 
@@ -739,7 +740,7 @@ get_long_basename (char * name, char * buf, int size)
   int len = 0;
 
   /* must be valid filename, no wild cards or other invalid characters */
-  if (strpbrk (name, "*?|<>\""))
+  if (_mbspbrk (name, "*?|<>\""))
     return 0;
 
   dir_handle = FindFirstFile (name, &find_data);
@@ -814,7 +815,7 @@ is_unc_volume (const char *filename)
   if (!IS_DIRECTORY_SEP (ptr[0]) || !IS_DIRECTORY_SEP (ptr[1]) || !ptr[2])
     return 0;
 
-  if (strpbrk (ptr + 2, "*?|<>\"\\/"))
+  if (_mbspbrk (ptr + 2, "*?|<>\"\\/"))
     return 0;
 
   return 1;
@@ -2386,8 +2387,12 @@ stat (const char * path, struct stat * buf)
     }
 
   name = (char *) map_w32_filename (path, &path);
-  /* must be valid filename, no wild cards or other invalid characters */
-  if (strpbrk (name, "*?|<>\""))
+  /* Must be valid filename, no wild cards or other invalid
+     characters.  We use _mbspbrk to support multibyte strings that
+     might look to strpbrk as if they included literal *, ?, and other
+     characters mentioned below that are disallowed by Windows
+     filesystems.  */
+  if (_mbspbrk (name, "*?|<>\""))
     {
       errno = ENOENT;
       return -1;
diff --git a/src/w32fns.c b/src/w32fns.c
index e7cafce29a6..5a938622383 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -298,6 +298,10 @@ extern int w32_use_visible_system_caret;
 
 static HWND w32_visible_system_caret_hwnd;
 
+/* From w32menu.c  */
+extern HMENU current_popup_menu;
+static int menubar_in_use = 0;
+
 
 /* Error if we are not connected to MS-Windows.  */
 void
@@ -3412,11 +3416,14 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
           KillTimer (hwnd, menu_free_timer);
           menu_free_timer = 0;
           f = x_window_to_frame (dpyinfo, hwnd);
-          if (!f->output_data.w32->menu_command_in_progress)
+          /* If a popup menu is active, don't wipe its strings.  */
+          if (menubar_in_use
+              && current_popup_menu == NULL)
             {
               /* Free memory used by owner-drawn and help-echo strings.  */
               w32_free_menu_strings (hwnd);
               f->output_data.w32->menubar_active = 0;
+              menubar_in_use = 0;
             }
         }
       return 0;
@@ -3468,16 +3475,21 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
         if (find_deferred_msg (hwnd, msg) != NULL)
           abort ();
 
+        menubar_in_use = 1;
+
         return send_deferred_msg (&msg_buf, hwnd, msg, wParam, lParam);
       }
 
     case WM_EXITMENULOOP:
       f = x_window_to_frame (dpyinfo, hwnd);
 
-      /* If a menu command is not already in progress, check again
-         after a short delay, since Windows often (always?) sends the
-         WM_EXITMENULOOP before the corresponding WM_COMMAND message.  */
-      if (f && !f->output_data.w32->menu_command_in_progress)
+      /* If a menu is still active, check again after a short delay,
+         since Windows often (always?) sends the WM_EXITMENULOOP
+         before the corresponding WM_COMMAND message.
+         Don't do this if a popup menu is active, since it is only
+         menubar menus that require cleaning up in this way.
+      */
+      if (f && menubar_in_use && current_popup_menu == NULL)
         menu_free_timer = SetTimer (hwnd, MENU_FREE_ID, MENU_FREE_DELAY, NULL);
       goto dflt;
 
@@ -3632,10 +3644,10 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
         }
       goto command;
     case WM_COMMAND:
+      menubar_in_use = 0;
       f = x_window_to_frame (dpyinfo, hwnd);
       if (f && HIWORD (wParam) == 0)
         {
-          f->output_data.w32->menu_command_in_progress = 1;
           if (menu_free_timer)
             {
               KillTimer (hwnd, menu_free_timer);
diff --git a/src/w32menu.c b/src/w32menu.c
index a3bd82a0d7d..ba29c6ae433 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -129,7 +129,7 @@ typedef struct _widget_value
 #define FALSE 0
 #endif /* no TRUE */
 
-static HMENU current_popup_menu;
+HMENU current_popup_menu;
 
 void syms_of_w32menu ();
 void globals_of_w32menu ();
@@ -835,7 +835,6 @@ cached information about equivalent key sequences.  */)
   UNBLOCK_INPUT;
 
   discard_menu_items ();
-  w32_free_menu_strings (FRAME_W32_WINDOW (f));
 
 #endif /* HAVE_MENUS */
 
@@ -1067,11 +1066,10 @@ menubar_selection_callback (FRAME_PTR f, void * client_data)
               buf.kind = MENU_BAR_EVENT;
               buf.frame_or_window = frame;
               buf.arg = entry;
-              kbd_buffer_store_event (&buf);
-
               /* Free memory used by owner-drawn and help-echo strings.  */
               w32_free_menu_strings (FRAME_W32_WINDOW (f));
-              f->output_data.w32->menu_command_in_progress = 0;
+              kbd_buffer_store_event (&buf);
+
               f->output_data.w32->menubar_active = 0;
               return;
             }
@@ -1080,7 +1078,6 @@ menubar_selection_callback (FRAME_PTR f, void * client_data)
     }
   /* Free memory used by owner-drawn and help-echo strings.  */
   w32_free_menu_strings (FRAME_W32_WINDOW (f));
-  f->output_data.w32->menu_command_in_progress = 0;
   f->output_data.w32->menubar_active = 0;
 }
 
@@ -1938,6 +1935,10 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
 
   DestroyMenu (menu);
 
+  /* Free the owner-drawn and help-echo menu strings.  */
+  w32_free_menu_strings (FRAME_W32_WINDOW (f));
+  f->output_data.w32->menubar_active = 0;
+
   /* Find the selected item, and its pane, to return
      the proper value.  */
   if (menu_item_selection != 0)
diff --git a/src/w32term.c b/src/w32term.c
index e488e4eeebc..c886ca48b8a 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,6 +1,7 @@
 /* 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, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998,
+                 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3624,25 +3625,51 @@ w32_set_scroll_bar_thumb (bar, portion, position, whole)
      int portion, position, whole;
 {
   Window w = SCROLL_BAR_W32_WINDOW (bar);
-  double range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height));
+  /* We use the whole scroll-bar height in the calculations below, to
+     avoid strange effects like scrolling backwards when just clicking
+     on the handle (without moving it).  */
+  double range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height))
+                 + VERTICAL_SCROLL_BAR_MIN_HANDLE;
   int sb_page, sb_pos;
   BOOL draggingp = !NILP (bar->dragging) ? TRUE : FALSE;
   SCROLLINFO si;
 
+  /* We used to change the nPage setting while dragging the handle,
+     but that had very strange effects (such as scrolling backwards
+     while dragging downwards).
+
+     Now, we don't change the nPage setting while dragging unless we
+     get near to the end of the buffer, in which case we often have to
+     resize the handle to "go all the way".  */
+
+  if (draggingp)
+    {
+      int near_bottom_p;
+      BLOCK_INPUT;
+      si.cbSize = sizeof (si);
+      si.fMask = SIF_POS | SIF_PAGE;
+      GetScrollInfo(w, SB_CTL, &si);
+      near_bottom_p = si.nPos + si.nPage >= range;
+      UNBLOCK_INPUT;
+      if (!near_bottom_p)
+        return;
+    }
+
   if (whole)
     {
       /* Position scroll bar at rock bottom if the bottom of the
          buffer is visible. This avoids shinking the thumb away
          to nothing if it is held at the bottom of the buffer.  */
-      if (position + portion >= whole)
-        {
-          sb_page = range * (whole - position) / whole
-            + VERTICAL_SCROLL_BAR_MIN_HANDLE;
-          sb_pos = range;
-        }
-
-      sb_page = portion * range / whole + VERTICAL_SCROLL_BAR_MIN_HANDLE;
-      sb_pos = position * range / whole;
+      if (position + portion >= whole && !draggingp)
+        {
+          sb_page = range * (whole - position) / whole;
+          sb_pos = range;
+        }
+      else
+        {
+          sb_pos = position * range / whole;
+          sb_page = (min (portion, (whole - position)) * range) / whole;
+        }
     }
   else
     {
@@ -3650,19 +3677,16 @@ w32_set_scroll_bar_thumb (bar, portion, position, whole)
       sb_pos = 0;
     }
 
+  sb_page = max (sb_page, VERTICAL_SCROLL_BAR_MIN_HANDLE);
+
   BLOCK_INPUT;
 
   si.cbSize = sizeof (si);
-  /* Only update page size if currently dragging, to reduce
-     flicker effects.  */
-  if (draggingp)
-    si.fMask = SIF_PAGE;
-  else
-    si.fMask = SIF_PAGE | SIF_POS;
+  si.fMask = SIF_PAGE | SIF_POS;
   si.nPage = sb_page;
   si.nPos = sb_pos;
 
-  SetScrollInfo (w, SB_CTL, &si, !draggingp);
+  SetScrollInfo (w, SB_CTL, &si, TRUE);
 
   UNBLOCK_INPUT;
 }
diff --git a/src/w32term.h b/src/w32term.h
index c1ad423ca67..6a3f7267e25 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -380,9 +380,6 @@ struct w32_output
   /* Nonzero means menubar is currently active.  */
   char menubar_active;
 
-  /* Nonzero means a menu command is being processed.  */
-  char menu_command_in_progress;
-
   /* Nonzero means menubar is about to become active, but should be
      brought up to date first.  */
   volatile char pending_menu_activation;
diff --git a/src/xfaces.c b/src/xfaces.c
index d10dec235ac..384c299791c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5680,13 +5680,11 @@ If FRAME is unspecified or nil, the current frame is used.  */)
   CHECK_LIVE_FRAME (frame);
   f = XFRAME (frame);
 
-  if ((CONSP (color1) && !parse_rgb_list (color1, &cdef1))
-      || !STRINGP (color1)
-      || !defined_color (f, SDATA (color1), &cdef1, 0))
+  if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1))
+      && !(STRINGP (color1) && defined_color (f, SDATA (color1), &cdef1, 0)))
     signal_error ("Invalid color", color1);
-  if ((CONSP (color2) && !parse_rgb_list (color2, &cdef2))
-      || !STRINGP (color2)
-      || !defined_color (f, SDATA (color2), &cdef2, 0))
+  if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2))
+      && !(STRINGP (color2) && defined_color (f, SDATA (color2), &cdef2, 0)))
     signal_error ("Invalid color", color2);
 
   return make_number (color_distance (&cdef1, &cdef2));
diff --git a/src/xterm.c b/src/xterm.c
index 99f51d78f63..925b4e3bd1f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8725,6 +8725,11 @@ do_ewmh_fullscreen (f)
 {
   int have_net_atom = wm_supports (f, "_NET_WM_STATE");
 
+  /* Some window managers don't say they support _NET_WM_STATE, but they do say
+     they support _NET_WM_STATE_FULLSCREEN.  Try that also.  */
+  if (!have_net_atom)
+      have_net_atom = wm_supports (f, "_NET_WM_STATE_FULLSCREEN");
+
   if (have_net_atom)
     {
       Lisp_Object frame;