[Emacs-diffs] /srv/bzr/emacs/trunk r104323: Remove var mistakenly introduced in revision 104320.

[Chong Yidong]

------------------------------------------------------------
revno: 104323
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-05-22 17:57:43 -0400
message:
  Remove var mistakenly introduced in revision 104320.
  
  * src/xselect.c (syms_of_xselect): Remove unused symbol SAVE_TARGETS.
  (Fx_get_selection_internal): Minor cleanup.
  (Fx_own_selection_internal): Rename arguments for consistency with
  select.el.
modified:
  src/ChangeLog
  src/xselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-22 21:12:04 +0000
+++ b/src/ChangeLog     2011-05-22 21:57:43 +0000
@@ -1,3 +1,10 @@
+2011-05-22  Chong Yidong  <address@hidden>
+
+       * xselect.c (syms_of_xselect): Remove unused symbol SAVE_TARGETS.
+       (Fx_get_selection_internal): Minor cleanup.
+       (Fx_own_selection_internal): Rename arguments for consistency with
+       select.el.
+
 2011-05-22  Paul Eggert  <address@hidden>
 
        * xselect.c (QSAVE_TARGETS): New static var, to fix build failure.

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2011-05-22 21:12:04 +0000
+++ b/src/xselect.c     2011-05-22 21:57:43 +0000
@@ -103,7 +103,7 @@
 
 static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
   QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL,
-  QATOM_PAIR, QSAVE_TARGETS;
+  QATOM_PAIR;
 
 static Lisp_Object QCOMPOUND_TEXT;     /* This is a type of selection.  */
 static Lisp_Object QUTF8_STRING;       /* This is a type of selection.  */
@@ -1996,18 +1996,18 @@
 
 DEFUN ("x-own-selection-internal", Fx_own_selection_internal,
        Sx_own_selection_internal, 2, 2, 0,
-       doc: /* Assert an X selection of the given TYPE with the given VALUE.
-TYPE is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
+       doc: /* Assert an X selection of type SELECTION and value VALUE.
+SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
 VALUE is typically a string, or a cons of two markers, but may be
 anything that the functions on `selection-converter-alist' know about.  */)
-  (Lisp_Object selection_name, Lisp_Object selection_value)
+  (Lisp_Object selection, Lisp_Object value)
 {
   check_x ();
-  CHECK_SYMBOL (selection_name);
-  if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
-  x_own_selection (selection_name, selection_value);
-  return selection_value;
+  CHECK_SYMBOL (selection);
+  if (NILP (value)) error ("VALUE may not be nil");
+  x_own_selection (selection, value);
+  return value;
 }
 
 
@@ -2046,22 +2046,16 @@
   val = x_get_local_selection (selection_symbol, target_type, 1);
 
   if (NILP (val))
-    {
-      val = x_get_foreign_selection (selection_symbol, target_type, 
time_stamp);
-      goto DONE;
-    }
+    RETURN_UNGCPRO (x_get_foreign_selection (selection_symbol,
+                                            target_type, time_stamp));
 
-  if (CONSP (val)
-      && SYMBOLP (XCAR (val)))
+  if (CONSP (val) && SYMBOLP (XCAR (val)))
     {
       val = XCDR (val);
       if (CONSP (val) && NILP (XCDR (val)))
        val = XCAR (val);
     }
-  val = clean_local_selection_data (val);
- DONE:
-  UNGCPRO;
-  return val;
+  RETURN_UNGCPRO (clean_local_selection_data (val));
 }
 
 DEFUN ("x-disown-selection-internal", Fx_disown_selection_internal,
@@ -2656,7 +2650,6 @@
   DEFSYM (QTARGETS, "TARGETS");
   DEFSYM (QATOM, "ATOM");
   DEFSYM (QATOM_PAIR, "ATOM_PAIR");
-  DEFSYM (QSAVE_TARGETS, "SAVE_TARGETS");
   DEFSYM (QNULL, "NULL");
   DEFSYM (Qcompound_text_with_extensions, "compound-text-with-extensions");
   DEFSYM (Qforeign_selection, "foreign-selection");