aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/nsselect.m14
2 files changed, 13 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 20f56774d22..fe60195e5e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12009-06-05 David Reitter <david.reitter@gmail.com>
2
3 * nsselect.m (Fx_own_selection_internal, Fx_selection_exists_p,
4 Fx_selection_owner_p): rename from Fns_own_selection_internal,
5 Fns_selection_exists_p, Fns_selection_owner_p.
6
12009-06-03 Jason Rumney <jasonr@gnu.org> 72009-06-03 Jason Rumney <jasonr@gnu.org>
2 8
3 * w32fns.c (x_create_tip_frame): Use the uniscribe font backend if 9 * w32fns.c (x_create_tip_frame): Use the uniscribe font backend if
diff --git a/src/nsselect.m b/src/nsselect.m
index b689d47747c..665b8cfd5ef 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -371,8 +371,8 @@ ns_string_to_pasteboard (id pb, Lisp_Object str)
371 ========================================================================== */ 371 ========================================================================== */
372 372
373 373
374DEFUN ("ns-own-selection-internal", Fns_own_selection_internal, 374DEFUN ("x-own-selection-internal", Fx_own_selection_internal,
375 Sns_own_selection_internal, 2, 2, 0, 375 Sx_own_selection_internal, 2, 2, 0,
376 doc: /* Assert a selection. 376 doc: /* Assert a selection.
377SELECTION-NAME is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. 377SELECTION-NAME is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
378VALUE is typically a string, or a cons of two markers, but may be 378VALUE is typically a string, or a cons of two markers, but may be
@@ -426,7 +426,7 @@ DEFUN ("x-disown-selection-internal", Fx_disown_selection_internal,
426} 426}
427 427
428 428
429DEFUN ("ns-selection-exists-p", Fns_selection_exists_p, Sns_selection_exists_p, 429DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
430 0, 1, 0, doc: /* Whether there is an owner for the given selection. 430 0, 1, 0, doc: /* Whether there is an owner for the given selection.
431The arg should be the name of the selection in question, typically one of 431The arg should be the name of the selection in question, typically one of
432the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. 432the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
@@ -449,7 +449,7 @@ and t is the same as `SECONDARY'.) */)
449} 449}
450 450
451 451
452DEFUN ("ns-selection-owner-p", Fns_selection_owner_p, Sns_selection_owner_p, 452DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
453 0, 1, 0, 453 0, 1, 0,
454 doc: /* Whether the current Emacs process owns the given selection. 454 doc: /* Whether the current Emacs process owns the given selection.
455The arg should be the name of the selection in question, typically one of 455The arg should be the name of the selection in question, typically one of
@@ -556,9 +556,9 @@ syms_of_nsselect (void)
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 (&Sns_own_selection_internal); 559 defsubr (&Sx_own_selection_internal);
560 defsubr (&Sns_selection_exists_p); 560 defsubr (&Sx_selection_exists_p);
561 defsubr (&Sns_selection_owner_p); 561 defsubr (&Sx_selection_owner_p);
562#ifdef CUT_BUFFER_SUPPORT 562#ifdef CUT_BUFFER_SUPPORT
563 defsubr (&Sns_get_cut_buffer_internal); 563 defsubr (&Sns_get_cut_buffer_internal);
564 defsubr (&Sns_rotate_cut_buffers_internal); 564 defsubr (&Sns_rotate_cut_buffers_internal);