procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* alloc.c (allocate_string_data): Remove dead code.

Browse source 
* xsettings.c (XSETTINGS_FONT_NAME): Move under HAVE_XFT to
avoid GCC warning about unused macro.
This commit is contained in:
Dmitry Antipov 2012-06-27 19:46:48 +04:00
parent d5c6faf921
commit 2014308a5d
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-06-27 Dmitry Antipov <dmantipov@yandex.ru>
* alloc.c (allocate_string_data): Remove dead code.
* xsettings.c (XSETTINGS_FONT_NAME): Move under HAVE_XFT to
avoid GCC warning about unused macro.
2012-06-27 Dmitry Antipov <dmantipov@yandex.ru>
* alloc.c (allocate_string): Omit intervals initialization.

16
src/alloc.c
View file

@ -1991,9 +1991,9 @@ void
allocate_string_data (struct Lisp_String *s,
EMACS_INT nchars, EMACS_INT nbytes)
{
struct sdata *data, *old_data;
struct sdata *data;
struct sblock *b;
ptrdiff_t needed, old_nbytes;
ptrdiff_t needed;
if (STRING_BYTES_MAX < nbytes)
string_overflow ();
@ -2001,8 +2001,6 @@ allocate_string_data (struct Lisp_String *s,
/* Determine the number of bytes needed to store NBYTES bytes
of string data. */
needed = SDATA_SIZE (nbytes);
old_data = s->data ? SDATA_OF_STRING (s) : NULL;
old_nbytes = GC_STRING_BYTES (s);
MALLOC_BLOCK_INPUT;
@ -2072,16 +2070,6 @@ allocate_string_data (struct Lisp_String *s,
memcpy ((char *) data + needed, string_overrun_cookie,
GC_STRING_OVERRUN_COOKIE_SIZE);
#endif
/* If S had already data assigned, mark that as free by setting its
string back-pointer to null, and recording the size of the data
in it. */
if (old_data)
{
SDATA_NBYTES (old_data) = old_nbytes;
old_data->string = NULL;
}
consing_since_gc += needed;
}

3
src/xsettings.c
View file

@ -159,8 +159,9 @@ store_tool_bar_style_changed (const char *newstyle,
XCAR (dpyinfo->name_list_element));
}
#ifdef HAVE_XFT
#define XSETTINGS_FONT_NAME "Gtk/FontName"
#endif
#define XSETTINGS_TOOL_BAR_STYLE "Gtk/ToolbarStyle"
enum {