From: Karoly Lorentey <lorentey@elte.hu>
Date: Sat, 4 Mar 2006 23:07:13 +0000 (+0000)
Subject: Merged from emacs@sv.gnu.org
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d;p=emacs.git

Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-128
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-129
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-130
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-131
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-132
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-133
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-134
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-135
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-43
   Munge arch explicit ids in etc/images to match Emacs

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-44
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-45
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-46
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-47
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-48
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-524
---

00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d
diff --cc src/xselect.c
index 8c82a4b85d3,30739c74331..6776e732734
--- a/src/xselect.c
+++ b/src/xselect.c
@@@ -1370,26 -1374,17 +1382,26 @@@ x_get_foreign_selection (selection_symb
       Lisp_Object selection_symbol, target_type, time_stamp;
  {
    struct frame *sf = SELECTED_FRAME ();
 -  Window requestor_window = FRAME_X_WINDOW (sf);
 -  Display *display = FRAME_X_DISPLAY (sf);
 -  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (sf);
 +  Window requestor_window;
 +  Display *display;
 +  struct x_display_info *dpyinfo;
    Time requestor_time = last_event_timestamp;
 -  Atom target_property = dpyinfo->Xatom_EMACS_TMP;
 -  Atom selection_atom = symbol_to_x_atom (dpyinfo, display, selection_symbol);
 +  Atom target_property;
 +  Atom selection_atom;
    Atom type_atom;
    int secs, usecs;
-   int count;
+   int count = SPECPDL_INDEX ();
    Lisp_Object frame;
  
 +  if (! FRAME_X_P (sf))
 +    return Qnil;
 +
 +  requestor_window = FRAME_X_WINDOW (sf);
 +  display = FRAME_X_DISPLAY (sf);
 +  dpyinfo = FRAME_X_DISPLAY_INFO (sf);
 +  target_property = dpyinfo->Xatom_EMACS_TMP;
 +  selection_atom = symbol_to_x_atom (dpyinfo, display, selection_symbol);
 +
    if (CONSP (target_type))
      type_atom = symbol_to_x_atom (dpyinfo, display, XCAR (target_type));
    else