Merge from mainline.

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 06e3641b95f..b6b0556bb23 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xselect.c (QSAVE_TARGETS): New static var, to fix build failure.
+
 2011-05-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * xselect.c (syms_of_xselect): Include character.h; use DEFSYM.
diff --git a/src/xselect.c b/src/xselect.c
index c0b1fd4658f..3fb7077995a 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -103,7 +103,7 @@ static Lisp_Object clean_local_selection_data (Lisp_Object);
 
 static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
   QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL,
-  QATOM_PAIR;
+  QATOM_PAIR, QSAVE_TARGETS;
 
 static Lisp_Object QCOMPOUND_TEXT;      /* This is a type of selection.  */
 static Lisp_Object QUTF8_STRING;        /* This is a type of selection.  */