aboutsummaryrefslogtreecommitdiffstats
path: root/src/macselect.c
diff options
context:
space:
mode:
authorMiles Bader2005-05-20 04:22:05 +0000
committerMiles Bader2005-05-20 04:22:05 +0000
commit64e9342958694825be1664890dcd22fffcd50d3a (patch)
treea43e1796f5a49ae7eeec671447d10ac3731a1834 /src/macselect.c
parent5447510256e5a1b371407b751ddcc461044da5df (diff)
parenta18ff9886771c41186eebf8d7984fee2120dbe36 (diff)
downloademacs-64e9342958694825be1664890dcd22fffcd50d3a.tar.gz
emacs-64e9342958694825be1664890dcd22fffcd50d3a.zip
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 302-319) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 69) - Update from CVS
Diffstat (limited to 'src/macselect.c')
-rw-r--r--src/macselect.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/macselect.c b/src/macselect.c
index a115c9b3229..890bb62d1d4 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -1104,9 +1104,11 @@ next communication only. After the communication, this variable is
1104set to nil. */); 1104set to nil. */);
1105 Vnext_selection_coding_system = Qnil; 1105 Vnext_selection_coding_system = Qnil;
1106 1106
1107#ifdef MAC_OSX
1107 DEFVAR_LISP ("mac-services-selection", &Vmac_services_selection, 1108 DEFVAR_LISP ("mac-services-selection", &Vmac_services_selection,
1108 doc: /* Selection name for communication via Services menu. */); 1109 doc: /* Selection name for communication via Services menu. */);
1109 Vmac_services_selection = intern ("CLIPBOARD"); 1110 Vmac_services_selection = intern ("PRIMARY");
1111#endif
1110 1112
1111 QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY); 1113 QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY);
1112 QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY); 1114 QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY);