aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan D2010-08-16 10:17:02 +0200
committerJan D2010-08-16 10:17:02 +0200
commit573d150b4cdff52c36468a357bf3b435d44c2d7d (patch)
treeda6eadb9c39621cf674f3c6ab7a7bf2c967ad060 /src
parent921242c6f478be3c024935587877f9b6602b1c19 (diff)
downloademacs-573d150b4cdff52c36468a357bf3b435d44c2d7d.tar.gz
emacs-573d150b4cdff52c36468a357bf3b435d44c2d7d.zip
* nsselect.m (syms_of_nsselect): Don't intern QPRIMARY.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/nsselect.m1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3feeb5c9a72..bfc2f3582a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * nsselect.m: include keyboard.h for QPRIMARY, remove its 3 * nsselect.m: include keyboard.h for QPRIMARY, remove its
4 declaration (Bug#6863). 4 declaration (Bug#6863).
5 (syms_of_nsselect): Don't intern QPRIMARY.
5 6
6 * xselect.c: Remove declaration of QPRIMARY (Bug#6864). 7 * xselect.c: Remove declaration of QPRIMARY (Bug#6864).
7 8
diff --git a/src/nsselect.m b/src/nsselect.m
index fb1998a9799..f7e69964910 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -543,7 +543,6 @@ nxatoms_of_nsselect (void)
543void 543void
544syms_of_nsselect (void) 544syms_of_nsselect (void)
545{ 545{
546 QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY);
547 QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY); 546 QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY);
548 QTEXT = intern ("TEXT"); staticpro (&QTEXT); 547 QTEXT = intern ("TEXT"); staticpro (&QTEXT);
549 QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME); 548 QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME);