aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan D2010-08-19 07:55:30 +0200
committerJan D2010-08-19 07:55:30 +0200
commit2c0ac86767b5b7f362a287b5282d8397777b98a2 (patch)
tree18e1ff5035d2e619ec170afdd3f974e27241eb87 /src
parente720ae53ac68e4d6f8b0f582fd1cd979942185a4 (diff)
downloademacs-2c0ac86767b5b7f362a287b5282d8397777b98a2.tar.gz
emacs-2c0ac86767b5b7f362a287b5282d8397777b98a2.zip
* nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsselect.m4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4033a424aed..0a1a268d962 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-08-19 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
4
12010-08-18 Eli Zaretskii <eliz@gnu.org> 52010-08-18 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xterm.c (x_draw_bar_cursor): 7 * xterm.c (x_draw_bar_cursor):
diff --git a/src/nsselect.m b/src/nsselect.m
index 597d6e76253..9e434515edf 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -542,8 +542,8 @@ DEFUN ("ns-store-cut-buffer-internal", Fns_store_cut_buffer_internal,
542void 542void
543nxatoms_of_nsselect (void) 543nxatoms_of_nsselect (void)
544{ 544{
545 NXPrimaryPboard = @"PrimarySelection"; 545 NXPrimaryPboard = @"Selection";
546 NXSecondaryPboard = @"SecondarySelection"; 546 NXSecondaryPboard = @"Secondary";
547} 547}
548 548
549void 549void