summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Reitter <david.reitter@gmail.com>2009-06-05 14:08:16 +0000
committerDavid Reitter <david.reitter@gmail.com>2009-06-05 14:08:16 +0000
commit28bf482a7d4e577bc1efec8ca97501e372372444 (patch)
tree4e60a8ab9b4a1ba06e1e173dbdfcf13e4494e336
parenta5a79894f66d9e32df412322f5420dcf66a88b83 (diff)
downloademacs-28bf482a7d4e577bc1efec8ca97501e372372444.tar.gz
nsselect.m (Fx_own_selection_internal, Fx_selection_exists_p,
Fx_selection_owner_p): rename from Fns_own_selection_internal, Fns_selection_exists_p, Fns_selection_owner_p.
-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 @@
+2009-06-05 David Reitter <david.reitter@gmail.com>
+
+ * nsselect.m (Fx_own_selection_internal, Fx_selection_exists_p,
+ Fx_selection_owner_p): rename from Fns_own_selection_internal,
+ Fns_selection_exists_p, Fns_selection_owner_p.
+
2009-06-03 Jason Rumney <jasonr@gnu.org>
* 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)
========================================================================== */
-DEFUN ("ns-own-selection-internal", Fns_own_selection_internal,
- Sns_own_selection_internal, 2, 2, 0,
+DEFUN ("x-own-selection-internal", Fx_own_selection_internal,
+ Sx_own_selection_internal, 2, 2, 0,
doc: /* Assert a selection.
SELECTION-NAME is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
VALUE 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,
}
-DEFUN ("ns-selection-exists-p", Fns_selection_exists_p, Sns_selection_exists_p,
+DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
0, 1, 0, doc: /* Whether there is an owner for the given selection.
The arg should be the name of the selection in question, typically one of
the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
@@ -449,7 +449,7 @@ and t is the same as `SECONDARY'.) */)
}
-DEFUN ("ns-selection-owner-p", Fns_selection_owner_p, Sns_selection_owner_p,
+DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
0, 1, 0,
doc: /* Whether the current Emacs process owns the given selection.
The arg should be the name of the selection in question, typically one of
@@ -556,9 +556,9 @@ syms_of_nsselect (void)
defsubr (&Sx_disown_selection_internal);
defsubr (&Sx_get_selection_internal);
- defsubr (&Sns_own_selection_internal);
- defsubr (&Sns_selection_exists_p);
- defsubr (&Sns_selection_owner_p);
+ defsubr (&Sx_own_selection_internal);
+ defsubr (&Sx_selection_exists_p);
+ defsubr (&Sx_selection_owner_p);
#ifdef CUT_BUFFER_SUPPORT
defsubr (&Sns_get_cut_buffer_internal);
defsubr (&Sns_rotate_cut_buffers_internal);