Mercurial > emacs

diff src/xselect.c @ 109793:b60dcdd855f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents 14830418f9fc
children e2f8226efb99
line wrap: on
line diff
--- a/src/xselect.c	Fri Aug 06 03:43:29 2010 +0000
+++ b/src/xselect.c	Sun Aug 08 22:52:25 2010 +0000
@@ -2916,7 +2916,7 @@
 \"*selectionTimeout\" resource.  */);
   x_selection_timeout = 0;
 
-  QPRIMARY   = intern_c_string ("PRIMARY");	staticpro (&QPRIMARY);
+  /* QPRIMARY is defined in keyboard.c.  */
   QSECONDARY = intern_c_string ("SECONDARY");	staticpro (&QSECONDARY);
   QSTRING    = intern_c_string ("STRING");	staticpro (&QSTRING);
   QINTEGER   = intern_c_string ("INTEGER");	staticpro (&QINTEGER);