aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-02-14 21:40:43 +0000
committerKarl Heuer1994-02-14 21:40:43 +0000
commit703e0710e9be8a3043a7e3e47edc90676ec4065e (patch)
treeb5ecfe29caeb6758e3533f636135469c48ba7ad1 /src
parent3868b9ec223578604873624619672cdc6fc5f044 (diff)
downloademacs-703e0710e9be8a3043a7e3e47edc90676ec4065e.tar.gz
emacs-703e0710e9be8a3043a7e3e47edc90676ec4065e.zip
(x-own-selection-internal, x-get-selection-internal,
x-disown-selection-internal, x-selection-owner-p, x-selection-exists-p, x-get-cut-buffer-internal, x-store-cut-buffer-internal, x-rotate-cut-buffers-internal): call check_x.
Diffstat (limited to 'src')
-rw-r--r--src/xselect.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 943f21d094c..c2da7b0655b 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1577,6 +1577,7 @@ anything that the functions on `selection-converter-alist' know about.")
1577 (selection_name, selection_value) 1577 (selection_name, selection_value)
1578 Lisp_Object selection_name, selection_value; 1578 Lisp_Object selection_name, selection_value;
1579{ 1579{
1580 check_x ();
1580 CHECK_SYMBOL (selection_name, 0); 1581 CHECK_SYMBOL (selection_name, 0);
1581 if (NILP (selection_value)) error ("selection-value may not be nil."); 1582 if (NILP (selection_value)) error ("selection-value may not be nil.");
1582 x_own_selection (selection_name, selection_value); 1583 x_own_selection (selection_name, selection_value);
@@ -1600,6 +1601,7 @@ TYPE is the type of data desired, typically `STRING'.")
1600 Lisp_Object val = Qnil; 1601 Lisp_Object val = Qnil;
1601 struct gcpro gcpro1, gcpro2; 1602 struct gcpro gcpro1, gcpro2;
1602 GCPRO2 (target_type, val); /* we store newly consed data into these */ 1603 GCPRO2 (target_type, val); /* we store newly consed data into these */
1604 check_x ();
1603 CHECK_SYMBOL (selection_symbol, 0); 1605 CHECK_SYMBOL (selection_symbol, 0);
1604 1606
1605#if 0 /* #### MULTIPLE doesn't work yet */ 1607#if 0 /* #### MULTIPLE doesn't work yet */
@@ -1648,6 +1650,7 @@ Disowning it means there is no such selection.")
1648 Atom selection_atom; 1650 Atom selection_atom;
1649 XSelectionClearEvent event; 1651 XSelectionClearEvent event;
1650 1652
1653 check_x ();
1651 CHECK_SYMBOL (selection, 0); 1654 CHECK_SYMBOL (selection, 0);
1652 if (NILP (time)) 1655 if (NILP (time))
1653 timestamp = last_event_timestamp; 1656 timestamp = last_event_timestamp;
@@ -1708,6 +1711,7 @@ and t is the same as `SECONDARY'.)")
1708 (selection) 1711 (selection)
1709 Lisp_Object selection; 1712 Lisp_Object selection;
1710{ 1713{
1714 check_x ();
1711 CHECK_SYMBOL (selection, 0); 1715 CHECK_SYMBOL (selection, 0);
1712 if (EQ (selection, Qnil)) selection = QPRIMARY; 1716 if (EQ (selection, Qnil)) selection = QPRIMARY;
1713 if (EQ (selection, Qt)) selection = QSECONDARY; 1717 if (EQ (selection, Qt)) selection = QSECONDARY;
@@ -1731,6 +1735,7 @@ and t is the same as `SECONDARY'.)")
1731 Window owner; 1735 Window owner;
1732 Atom atom; 1736 Atom atom;
1733 Display *dpy = x_current_display; 1737 Display *dpy = x_current_display;
1738 check_x ();
1734 CHECK_SYMBOL (selection, 0); 1739 CHECK_SYMBOL (selection, 0);
1735 if (!NILP (Fx_selection_owner_p (selection))) 1740 if (!NILP (Fx_selection_owner_p (selection)))
1736 return Qt; 1741 return Qt;
@@ -1801,6 +1806,7 @@ DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal,
1801 unsigned long size; 1806 unsigned long size;
1802 Lisp_Object ret; 1807 Lisp_Object ret;
1803 1808
1809 check_x ();
1804 CHECK_CUT_BUFFER (buffer, 0); 1810 CHECK_CUT_BUFFER (buffer, 0);
1805 buffer_atom = symbol_to_x_atom (display, buffer); 1811 buffer_atom = symbol_to_x_atom (display, buffer);
1806 1812
@@ -1835,6 +1841,7 @@ DEFUN ("x-store-cut-buffer-internal", Fx_store_cut_buffer_internal,
1835 int max_bytes = SELECTION_QUANTUM (display); 1841 int max_bytes = SELECTION_QUANTUM (display);
1836 if (max_bytes > MAX_SELECTION_QUANTUM) max_bytes = MAX_SELECTION_QUANTUM; 1842 if (max_bytes > MAX_SELECTION_QUANTUM) max_bytes = MAX_SELECTION_QUANTUM;
1837 1843
1844 check_x ();
1838 CHECK_CUT_BUFFER (buffer, 0); 1845 CHECK_CUT_BUFFER (buffer, 0);
1839 CHECK_STRING (string, 0); 1846 CHECK_STRING (string, 0);
1840 buffer_atom = symbol_to_x_atom (display, buffer); 1847 buffer_atom = symbol_to_x_atom (display, buffer);
@@ -1879,6 +1886,7 @@ positive means move values forward, negative means backward.")
1879 Window window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ 1886 Window window = RootWindow (display, 0); /* Cut buffers are on screen 0 */
1880 Atom props [8]; 1887 Atom props [8];
1881 1888
1889 check_x ();
1882 CHECK_NUMBER (n, 0); 1890 CHECK_NUMBER (n, 0);
1883 if (XINT (n) == 0) return n; 1891 if (XINT (n) == 0) return n;
1884 if (! cut_buffers_initialized) initialize_cut_buffers (display, window); 1892 if (! cut_buffers_initialized) initialize_cut_buffers (display, window);