Get rid of backend-dependent selection-handling functions for kill/yank

and make it generic instead by relying on the lower-level selection
management functions.

* select.el (select-enable-clipboard): Rename from
gui-select-enable-clipboard.
(select-enable-primary): Move from x-win.el and rename from
x-select-enable-primary.
(gui-last-selected-text): Remove.
(gui--last-selected-text-clipboard, gui--last-selected-text-primary):
New vars.
(gui-select-text): Rewrite, based on x-win.el's old x-select-text.
(gui-select-text-alist, gui-selection-value-alist): Remove.
(x-select-request-type): Move from x-win.el.
(gui--selection-value-internal): New function, taken from x-win's
x-selection-value-internal.
(gui-selection-value): Rewrite, based on x-win.el's old x-selection-value.
(gui-set-selection-alist): Rename from gui-own-selection-alist and
extend it to handle a nil value as a "disown" request.
(gui-disown-selection-alist): Remove.
(xselect-convert-to-delete): Adjust accordingly.
(gui-set-selection): Simplify accordingly as well.  Use dotimes.

* lisp/frame.el (gui-method): Use window-system rather than framep.
(gui-method-declare): The tty case is now nil rather than t.
(make-frame): Adjust accordingly.

* lisp/term/x-win.el (x-last-selected-text-primary)
(x-select-enable-primary): Remove (moved to select.el).
(x-select-request-type): Move to select.el.
(x-selection-value-internal, x--selection-value): Remove functions.
(gui-selection-value, gui-select-text): Remove moethods.
(gui-set-selection): Merge own and disown methods.

* lisp/startup.el (command-line): Adjust now that `gui-method' expects nil
for ttys.

* lisp/term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard)
(ns-selection-value): Remove functions.
(gui-select-text, gui-selection-value): Don't define method any more.
(gui-set-selection): Merge the old own and disown methods.
(gui-selection-exists-p, gui-get-selection): Adjust to new name of
underlying C primitive.

* lisp/term/pc-win.el (w16-get-selection-value): Add dummy argument and drop
test of gui-select-enable-clipboard, to make it usable as
a gui-get-selection method.
(gui-selection-exists-p): Adjust to new name of C primitive.
(gui-set-selection): Merge own and disown methods.
(gui-select-text, gui-selection-value): Delete methods.
(w16--select-text): Delete function.

* lisp/term/w32-win.el (w32--select-text, w32--get-selection-value):
Delete function (move functionality into w32--set-selection and
w32--get-selection).
(gui-select-text, gui-selection-value): Don't define methods.
(w32--set-selection, w32--get-selection, w32--selection-owner-p):
New functions.
(gui-get-selection, gui-selection-owner-p, gui-selection-exists-p):
Use them.
(gui-selection-exists-p): Adjust to new name of C primitive.

* src/nsselect.m (ns_get_local_selection): Signal error rather than `quit'.
(Fns_own_selection_internal): Tighten scoping.
(Fns_selection_exists_p): Rename from Fx_selection_exists_p.
(Fns_get_selection): Rename from Fx_get_selection_internal.
(Fns_get_selection_internal, Fns_store_selection_internal):
Remove functions.
(syms_of_nsselect): Adjust accordingly.

* src/w16select.c (Fw16_selection_exists_p): Rename from
Fx_selection_exists_p.
(syms_of_win16select): Adjust accordingly.

* src/w32select.c (Fw32_selection_exists_p): Rename from
Fx_selection_exists_p.
(syms_of_w32select): Adjust accordingly.

4 files changed, 51 insertions, 60 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c7070c8000b..daa11d7f5c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2014-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * w32select.c (Fw32_selection_exists_p): Rename from
+        Fx_selection_exists_p.
+        (syms_of_w32select): Adjust accordingly.
+
+        * w16select.c (Fw16_selection_exists_p): Rename from
+        Fx_selection_exists_p.
+        (syms_of_win16select): Adjust accordingly.
+
+        * nsselect.m (ns_get_local_selection): Signal error rather than `quit'.
+        (Fns_own_selection_internal): Tighten scoping.
+        (Fns_selection_exists_p): Rename from Fx_selection_exists_p.
+        (Fns_get_selection): Rename from Fx_get_selection_internal.
+        (Fns_get_selection_internal, Fns_store_selection_internal):
+        Remove functions.
+        (syms_of_nsselect): Adjust accordingly.
+
 2014-10-21  Martin Rudalics  <rudalics@gmx.at>
 
         * w32fns.c (Fw32_frame_menu_bar_size): New function.
diff --git a/src/nsselect.m b/src/nsselect.m
index 3712ba064e7..8a2492127d8 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -26,7 +26,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 */
 
 /* This should be the first include, as it may set up #defines affecting
-   interpretation of even the system includes. */
+   interpretation of even the system includes.  */
 #include <config.h>
 
 #include "lisp.h"
@@ -161,8 +161,10 @@ ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype)
                                              length: SBYTES (str)
                                            encoding: NSUTF8StringEncoding
                                        freeWhenDone: NO];
+      // FIXME: Why those 2 different code paths?
       if (gtype == nil)
         {
+          // Used for ns-store-selection-internal.
           [pb declareTypes: ns_send_types owner: nil];
           tenum = [ns_send_types objectEnumerator];
           while ( (type = [tenum nextObject]) )
@@ -170,6 +172,8 @@ ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype)
         }
       else
         {
+          // Used for ns-own-selection-internal.
+          eassert (type == NSStringPboardType);
           [pb setString: nsStr forType: gtype];
         }
       [nsStr release];
@@ -183,13 +187,12 @@ ns_get_local_selection (Lisp_Object selection_name,
 {
   Lisp_Object local_value;
   Lisp_Object handler_fn, value, check;
-  ptrdiff_t count;
+  ptrdiff_t count = specpdl_ptr - specpdl;
 
   local_value = assq_no_quit (selection_name, Vselection_alist);
 
   if (NILP (local_value)) return Qnil;
 
-  count = specpdl_ptr - specpdl;
   specbind (Qinhibit_quit, Qt);
   CHECK_SYMBOL (target_type);
   handler_fn = Fcdr (Fassq (target_type, Vselection_converter_alist));
@@ -212,19 +215,16 @@ ns_get_local_selection (Lisp_Object selection_name,
 
   if (CONSP (check)
       && INTEGERP (XCAR (check))
-      && (INTEGERP (XCDR (check))||
-          (CONSP (XCDR (check))
-           && INTEGERP (XCAR (XCDR (check)))
-           && NILP (XCDR (XCDR (check))))))
+      && (INTEGERP (XCDR (check))
+          || (CONSP (XCDR (check))
+              && INTEGERP (XCAR (XCDR (check)))
+              && NILP (XCDR (XCDR (check))))))
     return value;
 
-  // FIXME: Why `quit' rather than `error'?
-  Fsignal (Qquit,
+  Fsignal (Qerror,
            list3 (build_string ("invalid data returned by"
                                 " selection-conversion function"),
                   handler_fn, value));
-  // FIXME: Beware, `quit' can return!!
-  return Qnil;
 }
 
 
@@ -338,7 +338,6 @@ anything that the functions on `selection-converter-alist' know about.  */)
      (Lisp_Object selection, Lisp_Object value)
 {
   id pb;
-  Lisp_Object old_value, new_value;
   NSString *type;
   Lisp_Object successful_p = Qnil, rest;
   Lisp_Object target_symbol, data;
@@ -351,13 +350,15 @@ anything that the functions on `selection-converter-alist' know about.  */)
   if (pb == nil) return Qnil;
 
   ns_declare_pasteboard (pb);
-  old_value = assq_no_quit (selection, Vselection_alist);
-  new_value = list2 (selection, value);
+  {
+    Lisp_Object old_value = assq_no_quit (selection, Vselection_alist);
+    Lisp_Object new_value = list2 (selection, value);
 
-  if (NILP (old_value))
-    Vselection_alist = Fcons (new_value, Vselection_alist);
-  else
-    Fsetcdr (old_value, Fcdr (new_value));
+    if (NILP (old_value))
+      Vselection_alist = Fcons (new_value, Vselection_alist);
+    else
+      Fsetcdr (old_value, Fcdr (new_value));
+  }
 
   /* We only support copy of text.  */
   type = NSStringPboardType;
@@ -372,6 +373,7 @@ anything that the functions on `selection-converter-alist' know about.  */)
 
   if (!EQ (Vns_sent_selection_hooks, Qunbound))
     {
+      /* FIXME: Use run-hook-with-args!  */
       for (rest = Vns_sent_selection_hooks; CONSP (rest); rest = Fcdr (rest))
         call3 (Fcar (rest), selection, target_symbol, successful_p);
     }
@@ -397,7 +399,7 @@ Disowning it means there is no such selection.  */)
 }
 
 
-DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
+DEFUN ("ns-selection-exists-p", Fns_selection_exists_p, Sns_selection_exists_p,
        0, 2, 0, doc: /* Whether there is an owner for the given X selection.
 SELECTION should be the name of the selection in question, typically
 one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.  (X expects
@@ -452,8 +454,8 @@ On Nextstep, TERMINAL is unused.  */)
 }
 
 
-DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
-       Sx_get_selection_internal, 2, 4, 0,
+DEFUN ("ns-get-selection", Fns_get_selection,
+       Sns_get_selection, 2, 4, 0,
        doc: /* Return text selected from some X window.
 SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
@@ -489,33 +491,6 @@ On Nextstep, TIME-STAMP and TERMINAL are unused.  */)
 }
 
 
-DEFUN ("ns-get-selection-internal", Fns_get_selection_internal,
-       Sns_get_selection_internal, 1, 1, 0,
-       doc: /* Returns the value of SELECTION as a string.
-SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.  */)
-     (Lisp_Object selection)
-{
-  id pb;
-  check_window_system (NULL);
-  pb = ns_symbol_to_pb (selection);
-  return pb != nil ? ns_string_from_pasteboard (pb) : Qnil;
-}
-
-
-DEFUN ("ns-store-selection-internal", Fns_store_selection_internal,
-       Sns_store_selection_internal, 2, 2, 0,
-       doc: /* Sets the string value of SELECTION.
-SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.  */)
-     (Lisp_Object selection, Lisp_Object string)
-{
-  id pb;
-  check_window_system (NULL);
-  pb = ns_symbol_to_pb (selection);
-  if (pb != nil) ns_string_to_pasteboard (pb, string);
-  return Qnil;
-}
-
-
 void
 nxatoms_of_nsselect (void)
 {
@@ -532,12 +507,10 @@ syms_of_nsselect (void)
   QFILE_NAME = intern_c_string ("FILE_NAME");   staticpro (&QFILE_NAME);
 
   defsubr (&Sns_disown_selection_internal);
-  defsubr (&Sx_get_selection_internal);
+  defsubr (&Sns_get_selection);
   defsubr (&Sns_own_selection_internal);
-  defsubr (&Sx_selection_exists_p);
+  defsubr (&Sns_selection_exists_p);
   defsubr (&Sns_selection_owner_p);
-  defsubr (&Sns_get_selection_internal);
-  defsubr (&Sns_store_selection_internal);
 
   Vselection_alist = Qnil;
   staticpro (&Vselection_alist);
diff --git a/src/w16select.c b/src/w16select.c
index c229ba5816a..2403a9be1e0 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -625,9 +625,9 @@ DEFUN ("w16-get-clipboard-data", Fw16_get_clipboard_data, Sw16_get_clipboard_dat
   return (ret);
 }
 
-/* Support checking for a clipboard selection. */
+/* Support checking for a clipboard selection.  */
 
-DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
+DEFUN ("w16-selection-exists-p", Fw16_selection_exists_p, Sw16_selection_exists_p,
        0, 2, 0,
        doc: /* Whether there is an owner for the given X selection.
 SELECTION should be the name of the selection in question, typically
@@ -677,7 +677,7 @@ syms_of_win16select (void)
 {
   defsubr (&Sw16_set_clipboard_data);
   defsubr (&Sw16_get_clipboard_data);
-  defsubr (&Sx_selection_exists_p);
+  defsubr (&Sw16_selection_exists_p);
 
   DEFVAR_LISP ("selection-coding-system", Vselection_coding_system,
                doc: /* Coding system for communicating with other programs.
diff --git a/src/w32select.c b/src/w32select.c
index 9fa84ca5c54..b1419e52ac9 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1013,9 +1013,9 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data,
   return (ret);
 }
 
-/* Support checking for a clipboard selection. */
+/* Support checking for a clipboard selection.  */
 
-DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
+DEFUN ("w32-selection-exists-p", Fw32_selection_exists_p, Sw32_selection_exists_p,
        0, 2, 0,
        doc: /* Whether there is an owner for the given X selection.
 SELECTION should be the name of the selection in question, typically
@@ -1031,7 +1031,7 @@ frame's display, or the first available X display.  */)
   CHECK_SYMBOL (selection);
 
   /* Return nil for PRIMARY and SECONDARY selections; for CLIPBOARD, check
-     if the clipboard currently has valid text format contents. */
+     if the clipboard currently has valid text format contents.  */
 
   if (EQ (selection, QCLIPBOARD))
     {
@@ -1060,14 +1060,14 @@ frame's display, or the first available X display.  */)
 }
 
 /* One-time init.  Called in the un-dumped Emacs, but not in the
-   dumped version. */
+   dumped version.  */
 
 void
 syms_of_w32select (void)
 {
   defsubr (&Sw32_set_clipboard_data);
   defsubr (&Sw32_get_clipboard_data);
-  defsubr (&Sx_selection_exists_p);
+  defsubr (&Sw32_selection_exists_p);
 
   DEFVAR_LISP ("selection-coding-system", Vselection_coding_system,
                doc: /* Coding system for communicating with other programs.