comparison src/nsselect.m @ 111572:b3f9490f0b7f

merge trunk
author Kenichi Handa <handa@m17n.org>
date Mon, 08 Nov 2010 14:19:24 +0900
parents 7e83565f8d0e
children 417b1e4d63cd
comparison
equal deleted inserted replaced
111571:91de9477a77a 111572:b3f9490f0b7f
547 } 547 }
548 548
549 void 549 void
550 syms_of_nsselect (void) 550 syms_of_nsselect (void)
551 { 551 {
552 QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD); 552 QCLIPBOARD = intern_c_string ("CLIPBOARD"); staticpro (&QCLIPBOARD);
553 QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY); 553 QSECONDARY = intern_c_string ("SECONDARY"); staticpro (&QSECONDARY);
554 QTEXT = intern ("TEXT"); staticpro (&QTEXT); 554 QTEXT = intern_c_string ("TEXT"); staticpro (&QTEXT);
555 QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME); 555 QFILE_NAME = intern_c_string ("FILE_NAME"); staticpro (&QFILE_NAME);
556 556
557 defsubr (&Sx_disown_selection_internal); 557 defsubr (&Sx_disown_selection_internal);
558 defsubr (&Sx_get_selection_internal); 558 defsubr (&Sx_get_selection_internal);
559 defsubr (&Sx_own_selection_internal); 559 defsubr (&Sx_own_selection_internal);
560 defsubr (&Sx_selection_exists_p); 560 defsubr (&Sx_selection_exists_p);
603 or when a Lisp program explicitly clears the selection.)\n\ 603 or when a Lisp program explicitly clears the selection.)\n\
604 The functions are called with one argument, the selection type\n\ 604 The functions are called with one argument, the selection type\n\
605 \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD')."); 605 \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD').");
606 Vns_lost_selection_hooks = Qnil; 606 Vns_lost_selection_hooks = Qnil;
607 607
608 Qforeign_selection = intern ("foreign-selection"); 608 Qforeign_selection = intern_c_string ("foreign-selection");
609 staticpro (&Qforeign_selection); 609 staticpro (&Qforeign_selection);
610 } 610 }
611 611
612 // arch-tag: 39d1dde7-06a6-49ff-95a7-0e7af12d2218 612 // arch-tag: 39d1dde7-06a6-49ff-95a7-0e7af12d2218