Mercurial > emacs

comparison 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
comparison
equal deleted inserted replaced
109649:1f8f03cfcd2b 109793:b60dcdd855f0
2914 If the selection owner doesn't reply in this time, we give up. 2914 If the selection owner doesn't reply in this time, we give up.
2915 A value of 0 means wait as long as necessary. This is initialized from the 2915 A value of 0 means wait as long as necessary. This is initialized from the
2916 \"*selectionTimeout\" resource. */); 2916 \"*selectionTimeout\" resource. */);
2917 x_selection_timeout = 0; 2917 x_selection_timeout = 0;
2918 2918
2919 QPRIMARY = intern_c_string ("PRIMARY"); staticpro (&QPRIMARY); 2919 /* QPRIMARY is defined in keyboard.c. */
2920 QSECONDARY = intern_c_string ("SECONDARY"); staticpro (&QSECONDARY); 2920 QSECONDARY = intern_c_string ("SECONDARY"); staticpro (&QSECONDARY);
2921 QSTRING = intern_c_string ("STRING"); staticpro (&QSTRING); 2921 QSTRING = intern_c_string ("STRING"); staticpro (&QSTRING);
2922 QINTEGER = intern_c_string ("INTEGER"); staticpro (&QINTEGER); 2922 QINTEGER = intern_c_string ("INTEGER"); staticpro (&QINTEGER);
2923 QCLIPBOARD = intern_c_string ("CLIPBOARD"); staticpro (&QCLIPBOARD); 2923 QCLIPBOARD = intern_c_string ("CLIPBOARD"); staticpro (&QCLIPBOARD);
2924 QTIMESTAMP = intern_c_string ("TIMESTAMP"); staticpro (&QTIMESTAMP); 2924 QTIMESTAMP = intern_c_string ("TIMESTAMP"); staticpro (&QTIMESTAMP);