aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfns.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 09dcbbfb92d..78f977bf0aa 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5890,7 +5890,8 @@ If WINDOW-ID is non-nil, change the property of that window instead
5890 elsize = element_format == 32 ? sizeof (long) : element_format >> 3; 5890 elsize = element_format == 32 ? sizeof (long) : element_format >> 3;
5891 data = xnmalloc (nelements, elsize); 5891 data = xnmalloc (nelements, elsize);
5892 5892
5893 x_fill_property_data (FRAME_X_DISPLAY (f), value, data, element_format); 5893 x_fill_property_data (FRAME_X_DISPLAY (f), value, data, nelements,
5894 element_format);
5894 } 5895 }
5895 else 5896 else
5896 { 5897 {
@@ -6196,10 +6197,10 @@ Otherwise, the return value is a vector with the following fields:
6196 { 6197 {
6197 XFree (tmp_data); 6198 XFree (tmp_data);
6198 6199
6199 prop_attr = make_uninit_vector (3); 6200 prop_attr = CALLN (Fvector,
6200 ASET (prop_attr, 0, make_fixnum (actual_type)); 6201 make_fixnum (actual_type),
6201 ASET (prop_attr, 1, make_fixnum (actual_format)); 6202 make_fixnum (actual_format),
6202 ASET (prop_attr, 2, make_fixnum (bytes_remaining / (actual_format >> 3))); 6203 make_fixnum (bytes_remaining / (actual_format >> 3)));
6203 } 6204 }
6204 6205
6205 unblock_input (); 6206 unblock_input ();
@@ -8027,7 +8028,7 @@ If this equals the symbol 'resize-mode', Emacs uses GTK's resize mode to
8027always trigger an immediate resize of the child frame. This method is 8028always trigger an immediate resize of the child frame. This method is
8028deprecated by GTK and may not work in future versions of that toolkit. 8029deprecated by GTK and may not work in future versions of that toolkit.
8029It also may freeze Emacs when used with other desktop environments. It 8030It also may freeze Emacs when used with other desktop environments. It
8030avoids, however, the unpleasent flicker induced by the hiding approach. 8031avoids, however, the unpleasant flicker induced by the hiding approach.
8031 8032
8032This variable is considered a temporary workaround and will be hopefully 8033This variable is considered a temporary workaround and will be hopefully
8033eliminated in future versions of Emacs. */); 8034eliminated in future versions of Emacs. */);