mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 04:30:45 -08:00
Code Issues Projects Releases Wiki Activity

* xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string

Browse source 
instead of truncating it to 63 (admittedly a generous limit).
This commit is contained in:
Paul Eggert 2012-06-24 16:14:39 -07:00
parent d188e26b1a
commit 885d1d74a7
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2012-06-24 Paul Eggert <eggert@cs.ucla.edu>
* xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string
instead of truncating it to 63 (admittedly a generous limit).
* process.c: Fix spelling and caps in comments.
2012-06-24 Dan Nicolaescu <dann@ics.uci.edu>

8
src/xterm.c
View file

@ -10375,14 +10375,16 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
const int total_atom_count = 1 + atom_count;
Atom *atoms_return = xmalloc (sizeof (Atom) * total_atom_count);
char **atom_names = xmalloc (sizeof (char *) * total_atom_count);
char xsettings_atom_name[64];
static char const xsettings_fmt[] = "_XSETTINGS_S%d";
char xsettings_atom_name[sizeof xsettings_fmt - 2
+ INT_STRLEN_BOUND (int)];
for (i = 0; i < atom_count; i++)
atom_names[i] = (char *) atom_refs[i].name;
/* Build _XSETTINGS_SN atom name */
snprintf (xsettings_atom_name, sizeof (xsettings_atom_name),
"_XSETTINGS_S%d", XScreenNumberOfScreen (dpyinfo->screen));
sprintf (xsettings_atom_name, xsettings_fmt,
XScreenNumberOfScreen (dpyinfo->screen));
atom_names[i] = xsettings_atom_name;
XInternAtoms (dpyinfo->display, atom_names, total_atom_count,