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

fixes: PREPARE_FACE_FOR_DISPLAY was removed, DEFUN less lenient

Browse source
This commit is contained in:
Joakim Verona 2014-06-23 10:04:07 +02:00
parent c4916d541b
commit d92d0dd4f2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xdisp.c
View file

@ -25347,7 +25347,7 @@ produce_xwidget_glyph (struct it *it)
face = FACE_FROM_ID (it->f, it->face_id);
eassert (face);
/* Make sure X resources of the face is loaded. */
PREPARE_FACE_FOR_DISPLAY (it->f, face);
prepare_face_for_display (it->f, face);
xw = it->xwidget;
it->ascent = it->phys_ascent = glyph_ascent = xw->height/2;

3
src/xwidget.c
View file

@ -606,7 +606,8 @@ xwidget_osr_event_forward (GtkWidget *widget,
}
GIRepository *girepository ;
DEFUN( "xwgir-require-namespace",Fxwgir_require_namespace, Sxwgir_require_namespace, 2,2,0,
DEFUN ("xwgir-require-namespace", Fxwgir_require_namespace, Sxwgir_require_namespace, 2,2,0,
doc: /*require a namespace. must be done for all namespaces we want to use, before using other xwgir functions.*/)
(Lisp_Object lnamespace, Lisp_Object lnamespace_version)
{