Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 653-661)

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

 * gnus--rel--5.10  (patch 203-206)

   - Merge from emacs--devo--0
   - Update from CVS

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

9 files changed, 38 insertions, 25 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a01b3137e95..af6d98afb2a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2007-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does
+        not include -lX11 on Solaris.
+
+2007-03-02  Stuart D. Herring <herring@lanl.gov>
+
+        * keymap.c (Fkey_binding): Don't consider two-element lists as
+        events.
+
+2007-03-01  Kenichi Handa  <handa@m17n.org>
+
+        * process.c (send_process_object): Check the process status and
+        signal an error if something is wrong.
+
+2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * insdel.c (Fcombine_after_change_execute): Return nil if
+        combine_after_change_buffer has been invalidated.
+
 2007-02-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * m/xtensa.h: New file.
diff --git a/src/Makefile.in b/src/Makefile.in
index c5e1c18116b..e8fbfa2f8e7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -404,8 +404,6 @@ LIBXT=$(LIBW)
 #endif /* not USE_X_TOOLKIT */
 
 #if HAVE_XFT
-#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */
-#define LIB_X11_LIB
 XFT_LIBS=@XFT_LIBS@
 #endif /* HAVE_XFT */
 
diff --git a/src/insdel.c b/src/insdel.c
index 6f8aac3d6da..d7ba13ecbca 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2384,6 +2384,17 @@ DEFUN ("combine-after-change-execute", Fcombine_after_change_execute,
   if (NILP (combine_after_change_list))
     return Qnil;
 
+  /* It is rare for combine_after_change_buffer to be invalid, but
+     possible.  It can happen when combine-after-change-calls is
+     non-nil, and insertion calls a file handler (e.g. through
+     lock_file) which scribbles into a temp file -- cyd  */
+  if (!BUFFERP (combine_after_change_buffer)
+      || NILP (XBUFFER (combine_after_change_buffer)->name))
+    {
+      combine_after_change_list = Qnil;
+      return Qnil;
+    }
+
   record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
 
   Fset_buffer (combine_after_change_buffer);
diff --git a/src/keymap.c b/src/keymap.c
index 671801fa1ba..abf934908cc 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1645,10 +1645,10 @@ specified buffer position instead of point are used.
 
       /* We are not interested in locations without event data */
 
-      if (EVENT_HAS_PARAMETERS (event))
+      if (EVENT_HAS_PARAMETERS (event) && CONSP (XCDR (event)))
         {
           Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
-          if (CONSP (XCDR (event)) && EQ (kind, Qmouse_click))
+          if (EQ (kind, Qmouse_click))
             position = EVENT_START (event);
         }
     }
diff --git a/src/m/alpha.h b/src/m/alpha.h
index cf629c20291..6a9f09ed0bd 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -6,7 +6,7 @@ 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)
+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,
diff --git a/src/m/macppc.h b/src/m/macppc.h
index eba0a401a18..117d7a11dc4 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -6,7 +6,7 @@ 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)
+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,
diff --git a/src/m/mips4.h b/src/m/mips4.h
index 06db7d5dff0..f9517d6b560 100644
--- a/src/m/mips4.h
+++ b/src/m/mips4.h
@@ -7,7 +7,7 @@ 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)
+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,
diff --git a/src/m/news-risc.h b/src/m/news-risc.h
index 07e055dac9a..0a2564553f7 100644
--- a/src/m/news-risc.h
+++ b/src/m/news-risc.h
@@ -7,7 +7,7 @@ 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)
+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,
diff --git a/src/m/xtensa.h b/src/m/xtensa.h
index c5039e1a8a1..049874635d8 100644
--- a/src/m/xtensa.h
+++ b/src/m/xtensa.h
@@ -1,22 +1,6 @@
 /* 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.  */
+Add a license notice if this grows to > 10 lines of code.  */
 
 #define NO_ARG_ARRAY
 #define NO_UNION_TYPE